On 22/09/2016 at 11:48:00 +0200, Arnd Bergmann wrote : > A bug fix for the ACPI side of this driver caused a harmless > build warning: > > drivers/rtc/rtc-cmos.c:1115:13: error: 'cmos_check_acpi_rtc_status' defined > but not used [-Werror=unused-function] > static void cmos_check_acpi_rtc_status(struct device *dev, > > We can avoid the warning and simplify the driver at the same time > by removing the #ifdef for CONFIG_PM and rely on the SIMPLE_DEV_PM_OPS() > to set everything up correctly. cmos_resume() has to get marked > as __maybe_unused so we don't introduce another warning, and > the two variants of cmos_poweroff() can get merged into one using > an IS_ENABLED() check. > > Fixes: 983bf1256edb ("rtc: cmos: Clear ACPI-driven alarms upon resume") > Signed-off-by: Arnd Bergmann <a...@arndb.de> > --- > drivers/rtc/rtc-cmos.c | 21 ++++----------------- > 1 file changed, 4 insertions(+), 17 deletions(-) > Applied, thanks.
-- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com