Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[~andy/linux] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 1bcb2a792e95cfddbc4c7126935bc6aed786fa2c..15789875128e87668a5693712adc5ecbaf45b77c 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -520,11 +520,13 @@ static void platform_drv_shutdown(struct device *_dev)
 }
 
 /**
- * platform_driver_register - register a driver for platform-level devices
+ * __platform_driver_register - register a driver for platform-level devices
  * @drv: platform driver structure
  */
-int platform_driver_register(struct platform_driver *drv)
+int __platform_driver_register(struct platform_driver *drv,
+                               struct module *owner)
 {
+       drv->driver.owner = owner;
        drv->driver.bus = &platform_bus_type;
        if (drv->probe)
                drv->driver.probe = platform_drv_probe;
@@ -535,7 +537,7 @@ int platform_driver_register(struct platform_driver *drv)
 
        return driver_register(&drv->driver);
 }
-EXPORT_SYMBOL_GPL(platform_driver_register);
+EXPORT_SYMBOL_GPL(__platform_driver_register);
 
 /**
  * platform_driver_unregister - unregister a driver for platform-level devices
@@ -885,7 +887,6 @@ int platform_pm_restore(struct device *dev)
 static const struct dev_pm_ops platform_dev_pm_ops = {
        .runtime_suspend = pm_generic_runtime_suspend,
        .runtime_resume = pm_generic_runtime_resume,
-       .runtime_idle = pm_generic_runtime_idle,
        USE_PLATFORM_PM_SLEEP_OPS
 };