| From 2fb08e6ca9f00d1aedb3964983e9c8f84b36b807 Mon Sep 17 00:00:00 2001 |
| From: Paul Fox <pgf@laptop.org> |
| Date: Wed, 12 Jan 2011 17:00:07 -0800 |
| Subject: rtc-cmos: fix suspend/resume |
| |
| From: Paul Fox <pgf@laptop.org> |
| |
| commit 2fb08e6ca9f00d1aedb3964983e9c8f84b36b807 upstream. |
| |
| 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. |
| |
| Paul said: |
| |
| : The user visible symptom in our (XO laptop) case was that rtcwake would |
| : fail to wake the laptop. The RTC alarm would expire, but the wakeup |
| : wasn't unmasked. |
| : |
| : As for severity, the impact may have been reduced because if I recall |
| : correctly, the bug only affected platforms with CONFIG_PNP disabled. |
| |
| Signed-off-by: Paul Fox <pgf@laptop.org> |
| Signed-off-by: Daniel Drake <dsd@laptop.org> |
| Acked-by: Rafael J. Wysocki <rjw@sisk.pl> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/rtc/rtc-cmos.c | 16 +++++++++------- |
| 1 file changed, 9 insertions(+), 7 deletions(-) |
| |
| --- 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> |
| @@ -855,7 +856,7 @@ static void __exit cmos_do_remove(struct |
| |
| #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; |
| @@ -902,7 +903,7 @@ static int cmos_suspend(struct device *d |
| */ |
| 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) |
| @@ -949,9 +950,9 @@ static int cmos_resume(struct device *de |
| return 0; |
| } |
| |
| +static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume); |
| + |
| #else |
| -#define cmos_suspend NULL |
| -#define cmos_resume NULL |
| |
| static inline int cmos_poweroff(struct device *dev) |
| { |
| @@ -1087,7 +1088,7 @@ static void __exit cmos_pnp_remove(struc |
| |
| 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) |
| @@ -1167,8 +1168,9 @@ static struct platform_driver cmos_platf |
| .shutdown = cmos_platform_shutdown, |
| .driver = { |
| .name = (char *) driver_name, |
| - .suspend = cmos_suspend, |
| - .resume = cmos_resume, |
| +#ifdef CONFIG_PM |
| + .pm = &cmos_pm_ops, |
| +#endif |
| } |
| }; |
| |