| Message ID | 1768dbd136598aa52607378cdc7ba7b7870ab263.1279116162.git.qy03fugy@stud.informatik.uni-erlangen.de |
|---|---|
| State | Accepted |
| Headers | show |
2010/7/14 Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>: > Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef > CONFIG_PM within ifdef CONFIG_ACPI is redundant. If you don't have other specific tree to merge your patch, please get Andrew's help to do this. Acked-by: Wan ZongShun <mcuos.com@gmail.com> > > Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> > --- > drivers/rtc/rtc-cmos.c | 6 ------ > 1 files changed, 0 insertions(+), 6 deletions(-) > > diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c > index 11b8ea2..5856167 100644 > --- a/drivers/rtc/rtc-cmos.c > +++ b/drivers/rtc/rtc-cmos.c > @@ -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 > -- > 1.7.0.4 > > -- > You received this message because you are subscribed to "rtc-linux". > Membership options at http://groups.google.com/group/rtc-linux . > Please read http://groups.google.com/group/rtc-linux/web/checklist > before submitting a driver.
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 11b8ea2..5856167 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -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
Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef CONFIG_PM within ifdef CONFIG_ACPI is redundant. Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> --- drivers/rtc/rtc-cmos.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)