nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

drivers/rtc/rtc-cmos.c: fix compilation warning when !CONFIG_PM_SLEEP

Browse source 
CONFIG_PM will be set also if only CONFIG_PM_RUNTIME is set which causes
the compiler to emit following warning:

  drivers/rtc/rtc-cmos.c:845:12: warning: =E2=80=98cmos_resume=E2=80=99 defined but not used [-Wunused-function]

Fix this by using CONFIG_PM_SLEEP instead of CONFIG_PM and removing it
from the driver pm ops as this has been taken care by
SIMPLE_DEV_PM_OPS() already.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mika Westerberg 2014-04-03 14:50:05 -07:00 committed by Linus Torvalds
parent a8a15eb19d
commit b5ada4600d
1 changed files with 3 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/rtc/rtc-cmos.c
View file

@ -837,7 +837,7 @@ static void __exit cmos_do_remove(struct device *dev)
cmos->dev = NULL; cmos->dev = NULL;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int cmos_suspend(struct device *dev) static int cmos_suspend(struct device *dev)
{ {
@ -935,8 +935,6 @@ static int cmos_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
#else #else
static inline int cmos_poweroff(struct device *dev) static inline int cmos_poweroff(struct device *dev)
@ -946,6 +944,8 @@ static inline int cmos_poweroff(struct device *dev)
#endif #endif
static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus. /* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus.
@ -1088,11 +1088,9 @@ static struct pnp_driver cmos_pnp_driver = {
/* flag ensures resume() gets called, and stops syslog spam */ /* flag ensures resume() gets called, and stops syslog spam */
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE, .flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
#ifdef CONFIG_PM_SLEEP
.driver = { .driver = {
.pm = &cmos_pm_ops, .pm = &cmos_pm_ops,
}, },
#endif
}; };
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */