A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

of/device: Replace of_device with platform_device in includes and core code

Browse source 
of_device is currently just an #define alias to platform_device until it
gets removed entirely.  This patch removes references to it from the
include directories and the core drivers/of code.

Signed-off-by: Grant Likely <[email protected]>
Acked-by: David S. Miller <[email protected]>
This commit is contained in:
Grant Likely 2010-07-22 13:59:23 -06:00
commit 94a0cb1fc6
7 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/of/device.c
View file

@ -26,7 +26,7 @@ const struct of_device_id *of_match_device(const struct of_device_id *matches,
}
EXPORT_SYMBOL(of_match_device);
struct of_device *of_dev_get(struct of_device *dev)
struct platform_device *of_dev_get(struct platform_device *dev)
{
struct device *tmp;
@ -34,13 +34,13 @@ struct of_device *of_dev_get(struct of_device *dev)
return NULL;
tmp = get_device(&dev->dev);
if (tmp)
return to_of_device(tmp);
return to_platform_device(tmp);
else
return NULL;
}
EXPORT_SYMBOL(of_dev_get);
void of_dev_put(struct of_device *dev)
void of_dev_put(struct platform_device *dev)
{
if (dev)
put_device(&dev->dev);
@ -50,18 +50,18 @@ EXPORT_SYMBOL(of_dev_put);
static ssize_t devspec_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct of_device *ofdev;
struct platform_device *ofdev;
ofdev = to_of_device(dev);
ofdev = to_platform_device(dev);
return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
}
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct of_device *ofdev;
struct platform_device *ofdev;
ofdev = to_of_device(dev);
ofdev = to_platform_device(dev);
return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
}
@ -90,15 +90,15 @@ struct device_attribute of_platform_device_attrs[] = {
*/
void of_release_dev(struct device *dev)
{
struct of_device *ofdev;
struct platform_device *ofdev;
ofdev = to_of_device(dev);
ofdev = to_platform_device(dev);
of_node_put(ofdev->dev.of_node);
kfree(ofdev);
}
EXPORT_SYMBOL(of_release_dev);
int of_device_register(struct of_device *ofdev)
int of_device_register(struct platform_device *ofdev)
{
BUG_ON(ofdev->dev.of_node == NULL);
@ -119,7 +119,7 @@ int of_device_register(struct of_device *ofdev)
}
EXPORT_SYMBOL(of_device_register);
void of_device_unregister(struct of_device *ofdev)
void of_device_unregister(struct platform_device *ofdev)
{
device_unregister(&ofdev->dev);
}

24
drivers/of/platform.c
View file

@ -94,11 +94,11 @@ static int of_platform_device_probe(struct device *dev)
{
int error = -ENODEV;
struct of_platform_driver *drv;
struct of_device *of_dev;
struct platform_device *of_dev;
const struct of_device_id *match;
drv = to_of_platform_driver(dev->driver);
of_dev = to_of_device(dev);
of_dev = to_platform_device(dev);
if (!drv->probe)
return error;
@ -116,7 +116,7 @@ static int of_platform_device_probe(struct device *dev)
static int of_platform_device_remove(struct device *dev)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
if (dev->driver && drv->remove)
@ -126,7 +126,7 @@ static int of_platform_device_remove(struct device *dev)
static void of_platform_device_shutdown(struct device *dev)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
if (dev->driver && drv->shutdown)
@ -137,7 +137,7 @@ static void of_platform_device_shutdown(struct device *dev)
static int of_platform_legacy_suspend(struct device *dev, pm_message_t mesg)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
int ret = 0;
@ -148,7 +148,7 @@ static int of_platform_legacy_suspend(struct device *dev, pm_message_t mesg)
static int of_platform_legacy_resume(struct device *dev)
{
struct of_device *of_dev = to_of_device(dev);
struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
int ret = 0;
@ -543,11 +543,11 @@ static void of_device_make_bus_id(struct device *dev)
* @bus_id: Name to assign to the device. May be null to use default name.
* @parent: Parent device.
*/
struct of_device *of_device_alloc(struct device_node *np,
struct platform_device *of_device_alloc(struct device_node *np,
const char *bus_id,
struct device *parent)
{
struct of_device *dev;
struct platform_device *dev;
int rc, i, num_reg = 0, num_irq = 0;
struct resource *res, temp_res;
@ -600,11 +600,11 @@ EXPORT_SYMBOL(of_device_alloc);
* @bus_id: name to assign device
* @parent: Linux device model parent device.
*/
struct of_device *of_platform_device_create(struct device_node *np,
struct platform_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
struct device *parent)
{
struct of_device *dev;
struct platform_device *dev;
dev = of_device_alloc(np, bus_id, parent);
if (!dev)
@ -642,7 +642,7 @@ static int of_platform_bus_create(const struct device_node *bus,
struct device *parent)
{
struct device_node *child;
struct of_device *dev;
struct platform_device *dev;
int rc = 0;
for_each_child_of_node(bus, child) {
@ -678,7 +678,7 @@ int of_platform_bus_probe(struct device_node *root,
struct device *parent)
{
struct device_node *child;
struct of_device *dev;
struct platform_device *dev;
int rc = 0;
if (matches == NULL)