Driver Core: Rework platform suspend/resume, print warning
RFC PATCH 1/1 Driver Core: Rework platform suspend/resume, print warning
From: Magnus Damm <[email protected]>
This patch reworks the platform driver code for legacy suspend and resume to avoid installing callbacks in struct device_driver. A warning is also added telling users to update the platform driver to use dev_pm_ops.
The functions platform_legacy_suspend()/resume() directly call suspend and resume callbacks in struct platform_driver instead of wrapping things in platform_drv_suspend()/resume().
---
Compiles fine, but not runtime tested.
drivers/base/platform.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-)
drivers/base/platform.c +12 -24
@@ -470,22 +470,6 @@ static void platform_drv_shutdown(struct drv->shutdown (dev); } -static int platform_drv_suspend (struct device *_dev,pm_message_t state) -{ -struct platform_driver *drv =to_platform_driver (_dev->driver); -struct platform_device *dev =to_platform_device (_dev); - -return drv->suspend (dev, state); -} - -static int platform_drv_resume (struct device *_dev) -{ -struct platform_driver *drv =to_platform_driver (_dev->driver); -struct platform_device *dev =to_platform_device (_dev); - -return drv->resume (dev); -} -/** * platform_driver_register * @drv: platform driver structure
@@ -499,10 +483,10 @@ int platform_driver_register(struct plat drv->driver.remove = platform_drv_remove;if (drv->shutdown) drv->driver.shutdown = platform_drv_shutdown; -if (drv->suspend) - drv->driver.suspend = platform_drv_suspend; -if (drv->resume) - drv->driver.resume = platform_drv_resume; +if (drv->suspend || drv->resume) +pr_warning ("Platform driver '%s' needs updating - please use " +"dev_pm_ops\n" , drv->driver.name); +return driver_register (&drv->driver); }EXPORT_SYMBOL_GPL (platform_driver_register);
@@ -634,20 +618,24 @@ static int platform_match(struct devicestatic int platform_legacy_suspend (struct device *dev,pm_message_t mesg) { +struct platform_driver *pdrv =to_platform_driver (dev->driver); +struct platform_device *pdev =to_platform_device (dev);int ret =0 ; -if (dev->driver && dev->driver->suspend) - ret = dev->driver->suspend (dev, mesg); +if (dev->driver && pdrv->suspend) + ret = pdrv->suspend (pdev, mesg);return ret; }static int platform_legacy_resume (struct device *dev) { +struct platform_driver *pdrv =to_platform_driver (dev->driver); +struct platform_device *pdev =to_platform_device (dev);int ret =0 ; -if (dev->driver && dev->driver->resume) - ret = dev->driver->resume (dev); +if (dev->driver && pdrv->resume) + ret = pdrv->resume (pdev);return ret; }
Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch reworks the platform driver code for legacy suspend and resume to avoid installing callbacks in struct
device_driver. A warning is also added telling users to update the platform driver to usedev_pm_ops.
Quoted 5 lines
The functions platform_legacy_suspend()/resume() directly call suspend and resume callbacks in struct
platform_driverinstead of wrapping things in platform_drv_suspend()/resume().Signed-off-by Magnus Damm <[email protected]>
Greg, is this patch fine with you?
Rafael
Quoted 76 lines
---
Compiles fine, but not runtime tested.
drivers/base/platform.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-)drivers/base/platform.c +12
-24@@ -470,22 +470,6 @@ static void platform_drv_shutdown(struct drv->shutdown (dev); } -static int platform_drv_suspend (struct device *_dev,pm_message_t state) -{ -struct platform_driver *drv =to_platform_driver (_dev->driver); -struct platform_device *dev =to_platform_device (_dev); - -return drv->suspend (dev, state); -} - -static int platform_drv_resume (struct device *_dev) -{ -struct platform_driver *drv =to_platform_driver (_dev->driver); -struct platform_device *dev =to_platform_device (_dev); - -return drv->resume (dev); -} -/** * platform_driver_register * @drv: platform driver structure @@ -499,10 +483,10 @@ int platform_driver_register(struct plat drv->driver.remove = platform_drv_remove;if (drv->shutdown) drv->driver.shutdown = platform_drv_shutdown; -if (drv->suspend) - drv->driver.suspend = platform_drv_suspend; -if (drv->resume) - drv->driver.resume = platform_drv_resume; +if (drv->suspend || drv->resume) +pr_warning ("Platform driver '%s' needs updating - please use " +"dev_pm_ops\n" , drv->driver.name); +return driver_register (&drv->driver); }EXPORT_SYMBOL_GPL (platform_driver_register);@@ -634,20 +618,24 @@ static int platform_match(struct devicestatic int platform_legacy_suspend (struct device *dev,pm_message_t mesg) { +struct platform_driver *pdrv =to_platform_driver (dev->driver); +struct platform_device *pdev =to_platform_device (dev);int ret =0 ; -if (dev->driver && dev->driver->suspend) - ret = dev->driver->suspend (dev, mesg); +if (dev->driver && pdrv->suspend) + ret = pdrv->suspend (pdev, mesg);return ret; }static int platform_legacy_resume (struct device *dev) { +struct platform_driver *pdrv =to_platform_driver (dev->driver); +struct platform_device *pdev =to_platform_device (dev);int ret =0 ; -if (dev->driver && dev->driver->resume) - ret = dev->driver->resume (dev); +if (dev->driver && pdrv->resume) + ret = pdrv->resume (pdev);return ret; }
Greg KH
Acked-byQuoted 8 lines · Rafael J. Wysocki
Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch reworks the platform driver code for legacy suspend and resume to avoid installing callbacks in struct
device_driver. A warning is also added telling users to update the platform driver to usedev_pm_ops.
Quoted 7 lines
Quoted 5 lines
The functions platform_legacy_suspend()/resume() directly call suspend and resume callbacks in struct
platform_driverinstead of wrapping things in platform_drv_suspend()/resume().Signed-off-by Magnus Damm <[email protected]>Greg, is this patch fine with you?
Fine with me. If you want to take it in your tree, feel free to add:
thanks,
greg k-h
Quoted 13 lines · Greg KH
Quoted 12 lines · Rafael J. Wysocki
Quoted 11 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch reworks the platform driver code for legacy suspend and resume to avoid installing callbacks in struct
device_driver. A warning is also added telling users to update the platform driver to usedev_pm_ops.The functions platform_legacy_suspend()/resume() directly call suspend and resume callbacks in struct
platform_driverinstead of wrapping things in platform_drv_suspend()/resume().
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Magnus Damm <[email protected]>Greg, is this patch fine with you?
Fine with me. If you want to take it in your tree, feel free to add:
I will, thanks!
Best,
Rafael