From: Arnd Bergmann <arnd@arndb.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Joshua Kinard <kumba@gentoo.org>,
Ralf Baechle <ralf@linux-mips.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com
Subject: [PATCH] rtc: ds1685: fix ds1685_rtc_alarm_irq_enable build error
Date: Wed, 18 Feb 2015 11:42:44 +0100 [thread overview]
Message-ID: <2372645.cW5yq1J1VV@wuerfel> (raw)
The newly added ds1685 driver causes a build error in linux-next
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 16380c153a69c ("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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aaaf5fbf56f ("rtc: add driver for DS1685 family of real time clocks")
---
For some reason, this error never showed up in linux-next, but it
does now that the driver has made it into mainline, while doing ARM
randconfig testing.
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 8c3bfcb115b7..5dc1ef9d0008 100644
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -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
/* ----------------------------------------------------------------------- */
next reply other threads:[~2015-02-18 10:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-18 10:42 Arnd Bergmann [this message]
2015-02-18 13:48 ` Joshua Kinard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2372645.cW5yq1J1VV@wuerfel \
--to=arnd@arndb.de \
--cc=a.zummo@towertech.it \
--cc=akpm@linux-foundation.org \
--cc=kumba@gentoo.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=rtc-linux@googlegroups.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®