Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de639c31 authored by Christian Dietrich's avatar Christian Dietrich Committed by Linus Torvalds
Browse files

drivers/rtc: remove unneeded ifdef CONFIG_PM 



Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef CONFIG_PM
within ifdef CONFIG_ACPI is redundant.

Signed-off-by: default avatarChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: default avatarWan ZongShun <mcuos.com@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d23b258

drivers/rtc/rtc-cmos.c

+0 −6
Original line number Diff line number Diff line
@@ -970,7 +970,6 @@ static inline int cmos_poweroff(struct device *dev) 


#include <linux/acpi.h>



#ifdef	CONFIG_PM

static u32 rtc_handler(void *context)

{

	acpi_clear_event(ACPI_EVENT_RTC);
@@ -999,11 +998,6 @@ static void rtc_wake_off(struct device *dev) 
{

	acpi_disable_event(ACPI_EVENT_RTC, 0);

}

#else

#define rtc_wake_setup()	do{}while(0)

#define rtc_wake_on		NULL

#define rtc_wake_off		NULL

#endif



/* Every ACPI platform has a mc146818 compatible "cmos rtc".  Here we find

 * its device node and pass extra config data.  This helps its driver use