Merge remote branch 'origin' into secretlab/next-spi

1 files changed, 29 insertions, 9 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4b4b565c835f..4d99c8bdfedc 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -187,7 +187,7 @@ EXPORT_SYMBOL_GPL(platform_device_alloc);
  * released.
  */
 int platform_device_add_resources(struct platform_device *pdev,
-                                  struct resource *res, unsigned int num)
+                                  const struct resource *res, unsigned int num)
 {
         struct resource *r;
 
@@ -367,7 +367,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);
  */
 struct platform_device *platform_device_register_simple(const char *name,
                                                         int id,
-                                                        struct resource *res,
+                                                        const struct resource *res,
                                                         unsigned int num)
 {
         struct platform_device *pdev;
@@ -735,7 +735,7 @@ static void platform_pm_complete(struct device *dev)
 
 #ifdef CONFIG_SUSPEND
 
-static int platform_pm_suspend(struct device *dev)
+int __weak platform_pm_suspend(struct device *dev)
 {
         struct device_driver *drv = dev->driver;
         int ret = 0;
@@ -753,7 +753,7 @@ static int platform_pm_suspend(struct device *dev)
         return ret;
 }
 
-static int platform_pm_suspend_noirq(struct device *dev)
+int __weak platform_pm_suspend_noirq(struct device *dev)
 {
         struct device_driver *drv = dev->driver;
         int ret = 0;
@@ -769,7 +769,7 @@ static int platform_pm_suspend_noirq(struct device *dev)
         return ret;
 }
 
-static int platform_pm_resume(struct device *dev)
+int __weak platform_pm_resume(struct device *dev)
 {
         struct device_driver *drv = dev->driver;
         int ret = 0;
@@ -787,7 +787,7 @@ static int platform_pm_resume(struct device *dev)
         return ret;
 }
 
-static int platform_pm_resume_noirq(struct device *dev)
+int __weak platform_pm_resume_noirq(struct device *dev)
 {
         struct device_driver *drv = dev->driver;
         int ret = 0;
@@ -967,17 +967,17 @@ static int platform_pm_restore_noirq(struct device *dev)
 
 int __weak platform_pm_runtime_suspend(struct device *dev)
 {
-        return -ENOSYS;
+        return pm_generic_runtime_suspend(dev);
 };
 
 int __weak platform_pm_runtime_resume(struct device *dev)
 {
-        return -ENOSYS;
+        return pm_generic_runtime_resume(dev);
 };
 
 int __weak platform_pm_runtime_idle(struct device *dev)
 {
-        return -ENOSYS;
+        return pm_generic_runtime_idle(dev);
 };
 
 #else /* !CONFIG_PM_RUNTIME */
@@ -1254,6 +1254,26 @@ static int __init early_platform_driver_probe_id(char *class_str,
                 }
 
                 if (match) {
+                        /*
+                         * Set up a sensible init_name to enable
+                         * dev_name() and others to be used before the
+                         * rest of the driver core is initialized.
+                         */
+                        if (!match->dev.init_name && slab_is_available()) {
+                                if (match->id != -1)
+                                        match->dev.init_name =
+                                                kasprintf(GFP_KERNEL, "%s.%d",
+                                                          match->name,
+                                                          match->id);
+                                else
+                                        match->dev.init_name =
+                                                kasprintf(GFP_KERNEL, "%s",
+                                                          match->name);
+
+                                if (!match->dev.init_name)
+                                        return -ENOMEM;
+                        }
+
                         if (epdrv->pdrv->probe(match))
                                 pr_warning("%s: unable to probe %s early.\n",
                                            class_str, match->name);