Commit 682354d4 authored Feb 27, 2015 by Arnd Bergmann Committed by Linus Torvalds Feb 28, 2015

rtc: ds1685: fix ds1685_rtc_alarm_irq_enable build error



The newly added ds1685 driver causes a build error when enabled without
CONFIG_RTC_INTF_DEV:

  drivers/rtc/rtc-ds1685.c:919:22: error: 'ds1685_rtc_alarm_irq_enable' undeclared here (not in a function)
    .alarm_irq_enable = ds1685_rtc_alarm_irq_enable,

Apparently the driver was incorrectly changed to reflect the interface
change from 16380c15 ("RTC: Convert rtc drivers to use the
alarm_irq_enable method"), which removed the respective #ifdef from all
other rtc drivers.

This does the same change that was merged for the other drivers before and
removes the #ifdef, allowing the interrupts to be enabled through the
in-kernel rtc interface independent of the existence of /dev/rtc.

Fixes: aaaf5fbf ("rtc: add driver for DS1685 family of real time clocks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Joshua Kinard <kumba@gentoo.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4e54dede

drivers/rtc/rtc-ds1685.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -528,7 +528,6 @@ ds1685_rtc_set_alarm(struct device dev, struct rtc_wkalrm alrm)
		/* ----------------------------------------------------------------------- */
		/* /dev/rtcX Interface functions */

		#ifdef CONFIG_RTC_INTF_DEV
		/**
		* ds1685_rtc_alarm_irq_enable - replaces ioctl() RTC_AIE on/off.
		* @dev: pointer to device structure.
		@@ -557,7 +556,6 @@ ds1685_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

		return 0;
		}
		#endif
		/* ----------------------------------------------------------------------- */

Admin message