mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
[PATCH] rtc framewok: rtc_wkalrm.enabled reporting updates
Fix a glitch in the procfs dumping of whether the alarm IRQ is enabled: use the traditional name (from drivers/char/rtc.c and many other places) of "alarm_IRQ", not "alrm_wakeup" (which didn't even match the efirtc code, which originated that reporting API). Also, update a few of the RTC drivers to stop providing that duplicate status, and/or to expose it properly when reporting the alarm state. We really don't want every RTC driver doing their own thing here... Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
5a6534e4cf
commit
a2db8dfce8
5 changed files with 8 additions and 12 deletions
|
@ -279,9 +279,8 @@ static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
|
|||
local_irq_enable();
|
||||
|
||||
bcd2tm(&alm->time);
|
||||
alm->pending = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
|
||||
alm->enabled = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
|
||||
& OMAP_RTC_INTERRUPTS_IT_ALARM);
|
||||
alm->enabled = alm->pending && device_may_wakeup(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue