1 files changed, 67 insertions, 63 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index dfcbfe504867..349a1013603f 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -24,7 +24,7 @@
                                  driver))
 
 struct device platform_bus = {
-        .bus_id         = "platform",
+        .init_name      = "platform",
 };
 EXPORT_SYMBOL_GPL(platform_bus);
 
@@ -242,16 +242,15 @@ int platform_device_add(struct platform_device *pdev)
         pdev->dev.bus = &platform_bus_type;
 
         if (pdev->id != -1)
-                snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%d", pdev->name,
-                         pdev->id);
+                dev_set_name(&pdev->dev, "%s.%d", pdev->name,  pdev->id);
         else
-                strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE);
+                dev_set_name(&pdev->dev, pdev->name);
 
         for (i = 0; i < pdev->num_resources; i++) {
                 struct resource *p, *r = &pdev->resource[i];
 
                 if (r->name == NULL)
-                        r->name = pdev->dev.bus_id;
+                        r->name = dev_name(&pdev->dev);
 
                 p = r->parent;
                 if (!p) {
@@ -264,14 +263,14 @@ int platform_device_add(struct platform_device *pdev)
                 if (p && insert_resource(p, r)) {
                         printk(KERN_ERR
                                "%s: failed to claim resource %d\n",
-                               pdev->dev.bus_id, i);
+                               dev_name(&pdev->dev), i);
                         ret = -EBUSY;
                         goto failed;
                 }
         }
 
         pr_debug("Registering platform device '%s'. Parent at %s\n",
-                 pdev->dev.bus_id, pdev->dev.parent->bus_id);
+                 dev_name(&pdev->dev), dev_name(pdev->dev.parent));
 
         ret = device_add(&pdev->dev);
         if (ret == 0)
@@ -503,8 +502,6 @@ int platform_driver_register(struct platform_driver *drv)
                 drv->driver.suspend = platform_drv_suspend;
         if (drv->resume)
                 drv->driver.resume = platform_drv_resume;
-        if (drv->pm)
-                drv->driver.pm = &drv->pm->base;
         return driver_register(&drv->driver);
 }
 EXPORT_SYMBOL_GPL(platform_driver_register);
@@ -609,7 +606,7 @@ static int platform_match(struct device *dev, struct device_driver *drv)
         struct platform_device *pdev;
 
         pdev = container_of(dev, struct platform_device, dev);
-        return (strncmp(pdev->name, drv->name, BUS_ID_SIZE) == 0);
+        return (strcmp(pdev->name, drv->name) == 0);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -686,7 +683,10 @@ static int platform_pm_suspend(struct device *dev)
         struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (drv && drv->pm) {
+        if (!drv)
+                return 0;
+
+        if (drv->pm) {
                 if (drv->pm->suspend)
                         ret = drv->pm->suspend(dev);
         } else {
@@ -698,16 +698,15 @@ static int platform_pm_suspend(struct device *dev)
 
 static int platform_pm_suspend_noirq(struct device *dev)
 {
-        struct platform_driver *pdrv;
+        struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (!dev->driver)
+        if (!drv)
                 return 0;
 
-        pdrv = to_platform_driver(dev->driver);
-        if (pdrv->pm) {
-                if (pdrv->pm->suspend_noirq)
-                        ret = pdrv->pm->suspend_noirq(dev);
+        if (drv->pm) {
+                if (drv->pm->suspend_noirq)
+                        ret = drv->pm->suspend_noirq(dev);
         } else {
                 ret = platform_legacy_suspend_late(dev, PMSG_SUSPEND);
         }
@@ -720,7 +719,10 @@ static int platform_pm_resume(struct device *dev)
         struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (drv && drv->pm) {
+        if (!drv)
+                return 0;
+
+        if (drv->pm) {
                 if (drv->pm->resume)
                         ret = drv->pm->resume(dev);
         } else {
@@ -732,16 +734,15 @@ static int platform_pm_resume(struct device *dev)
 
 static int platform_pm_resume_noirq(struct device *dev)
 {
-        struct platform_driver *pdrv;
+        struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (!dev->driver)
+        if (!drv)
                 return 0;
 
-        pdrv = to_platform_driver(dev->driver);
-        if (pdrv->pm) {
-                if (pdrv->pm->resume_noirq)
-                        ret = pdrv->pm->resume_noirq(dev);
+        if (drv->pm) {
+                if (drv->pm->resume_noirq)
+                        ret = drv->pm->resume_noirq(dev);
         } else {
                 ret = platform_legacy_resume_early(dev);
         }
@@ -780,16 +781,15 @@ static int platform_pm_freeze(struct device *dev)
 
 static int platform_pm_freeze_noirq(struct device *dev)
 {
-        struct platform_driver *pdrv;
+        struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (!dev->driver)
+        if (!drv)
                 return 0;
 
-        pdrv = to_platform_driver(dev->driver);
-        if (pdrv->pm) {
-                if (pdrv->pm->freeze_noirq)
-                        ret = pdrv->pm->freeze_noirq(dev);
+        if (drv->pm) {
+                if (drv->pm->freeze_noirq)
+                        ret = drv->pm->freeze_noirq(dev);
         } else {
                 ret = platform_legacy_suspend_late(dev, PMSG_FREEZE);
         }
@@ -802,7 +802,10 @@ static int platform_pm_thaw(struct device *dev)
         struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (drv && drv->pm) {
+        if (!drv)
+                return 0;
+
+        if (drv->pm) {
                 if (drv->pm->thaw)
                         ret = drv->pm->thaw(dev);
         } else {
@@ -814,16 +817,15 @@ static int platform_pm_thaw(struct device *dev)
 
 static int platform_pm_thaw_noirq(struct device *dev)
 {
-        struct platform_driver *pdrv;
+        struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (!dev->driver)
+        if (!drv)
                 return 0;
 
-        pdrv = to_platform_driver(dev->driver);
-        if (pdrv->pm) {
-                if (pdrv->pm->thaw_noirq)
-                        ret = pdrv->pm->thaw_noirq(dev);
+        if (drv->pm) {
+                if (drv->pm->thaw_noirq)
+                        ret = drv->pm->thaw_noirq(dev);
         } else {
                 ret = platform_legacy_resume_early(dev);
         }
@@ -836,7 +838,10 @@ static int platform_pm_poweroff(struct device *dev)
         struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (drv && drv->pm) {
+        if (!drv)
+                return 0;
+
+        if (drv->pm) {
                 if (drv->pm->poweroff)
                         ret = drv->pm->poweroff(dev);
         } else {
@@ -848,16 +853,15 @@ static int platform_pm_poweroff(struct device *dev)
 
 static int platform_pm_poweroff_noirq(struct device *dev)
 {
-        struct platform_driver *pdrv;
+        struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (!dev->driver)
+        if (!drv)
                 return 0;
 
-        pdrv = to_platform_driver(dev->driver);
-        if (pdrv->pm) {
-                if (pdrv->pm->poweroff_noirq)
-                        ret = pdrv->pm->poweroff_noirq(dev);
+        if (drv->pm) {
+                if (drv->pm->poweroff_noirq)
+                        ret = drv->pm->poweroff_noirq(dev);
         } else {
                 ret = platform_legacy_suspend_late(dev, PMSG_HIBERNATE);
         }
@@ -870,7 +874,10 @@ static int platform_pm_restore(struct device *dev)
         struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (drv && drv->pm) {
+        if (!drv)
+                return 0;
+
+        if (drv->pm) {
                 if (drv->pm->restore)
                         ret = drv->pm->restore(dev);
         } else {
@@ -882,16 +889,15 @@ static int platform_pm_restore(struct device *dev)
 
 static int platform_pm_restore_noirq(struct device *dev)
 {
-        struct platform_driver *pdrv;
+        struct device_driver *drv = dev->driver;
         int ret = 0;
 
-        if (!dev->driver)
+        if (!drv)
                 return 0;
 
-        pdrv = to_platform_driver(dev->driver);
-        if (pdrv->pm) {
-                if (pdrv->pm->restore_noirq)
-                        ret = pdrv->pm->restore_noirq(dev);
+        if (drv->pm) {
+                if (drv->pm->restore_noirq)
+                        ret = drv->pm->restore_noirq(dev);
         } else {
                 ret = platform_legacy_resume_early(dev);
         }
@@ -912,17 +918,15 @@ static int platform_pm_restore_noirq(struct device *dev)
 
 #endif /* !CONFIG_HIBERNATION */
 
-static struct pm_ext_ops platform_pm_ops = {
-        .base = {
-                .prepare = platform_pm_prepare,
-                .complete = platform_pm_complete,
-                .suspend = platform_pm_suspend,
-                .resume = platform_pm_resume,
-                .freeze = platform_pm_freeze,
-                .thaw = platform_pm_thaw,
-                .poweroff = platform_pm_poweroff,
-                .restore = platform_pm_restore,
-        },
+static struct dev_pm_ops platform_dev_pm_ops = {
+        .prepare = platform_pm_prepare,
+        .complete = platform_pm_complete,
+        .suspend = platform_pm_suspend,
+        .resume = platform_pm_resume,
+        .freeze = platform_pm_freeze,
+        .thaw = platform_pm_thaw,
+        .poweroff = platform_pm_poweroff,
+        .restore = platform_pm_restore,
         .suspend_noirq = platform_pm_suspend_noirq,
         .resume_noirq = platform_pm_resume_noirq,
         .freeze_noirq = platform_pm_freeze_noirq,
@@ -931,7 +935,7 @@ static struct pm_ext_ops platform_pm_ops = {
         .restore_noirq = platform_pm_restore_noirq,
 };
 
-#define PLATFORM_PM_OPS_PTR     &platform_pm_ops
+#define PLATFORM_PM_OPS_PTR     (&platform_dev_pm_ops)
 
 #else /* !CONFIG_PM_SLEEP */