lkml.org 
[lkml]   [2010]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH v2] rtc-cmos: fix suspend/resume
Date
On Sunday, December 19, 2010, Daniel Drake wrote:
> From: Paul Fox <pgf@laptop.org>
>
> rtc-cmos was setting suspend/resume hooks at the device_driver level.
> However, the platform bus code (drivers/base/platform.c) only looks
> for resume hooks at the dev_pm_ops level, or within the platform_driver.
>
> Switch rtc_cmos to use dev_pm_ops so that suspend/resume code is
> executed again.
>
> Signed-off-by: Paul Fox <pgf@laptop.org>
> Signed-off-by: Daniel Drake <dsd@laptop.org>
> ---
> drivers/rtc/rtc-cmos.c | 16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
> v2: incorporate feedback from Rafael J. Wysocki, fix tabs, make a bit more
> consistent with typical SIMPLE_DEV_PM_OPS users.
>
> diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
> index 5856167..b46c539 100644
> --- a/drivers/rtc/rtc-cmos.c
> +++ b/drivers/rtc/rtc-cmos.c
> @@ -36,6 +36,7 @@
> #include <linux/platform_device.h>
> #include <linux/mod_devicetable.h>
> #include <linux/log2.h>
> +#include <linux/pm.h>
>
> /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
> #include <asm-generic/rtc.h>
> @@ -850,7 +851,7 @@ static void __exit cmos_do_remove(struct device *dev)
>
> #ifdef CONFIG_PM
>
> -static int cmos_suspend(struct device *dev, pm_message_t mesg)
> +static int cmos_suspend(struct device *dev)
> {
> struct cmos_rtc *cmos = dev_get_drvdata(dev);
> unsigned char tmp;
> @@ -898,7 +899,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
> */
> static inline int cmos_poweroff(struct device *dev)
> {
> - return cmos_suspend(dev, PMSG_HIBERNATE);
> + return cmos_suspend(dev);
> }
>
> static int cmos_resume(struct device *dev)
> @@ -945,9 +946,9 @@ static int cmos_resume(struct device *dev)
> return 0;
> }
>
> +static const SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);

Well, SIMPLE_DEV_PM_OPS() has 'const' already, you only need to add 'static'.

Thanks,
Rafael


> +
> #else
> -#define cmos_suspend NULL
> -#define cmos_resume NULL
>
> static inline int cmos_poweroff(struct device *dev)
> {
> @@ -1077,7 +1078,7 @@ static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
>
> static int cmos_pnp_suspend(struct pnp_dev *pnp, pm_message_t mesg)
> {
> - return cmos_suspend(&pnp->dev, mesg);
> + return cmos_suspend(&pnp->dev);
> }
>
> static int cmos_pnp_resume(struct pnp_dev *pnp)
> @@ -1157,8 +1158,9 @@ static struct platform_driver cmos_platform_driver = {
> .shutdown = cmos_platform_shutdown,
> .driver = {
> .name = (char *) driver_name,
> - .suspend = cmos_suspend,
> - .resume = cmos_resume,
> +#ifdef CONFIG_PM
> + .pm = &cmos_pm_ops,
> +#endif
> }
> };
>
>



\
 
 \ /
  Last update: 2010-12-19 20:01    [W:0.064 / U:0.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site