[PATCH] rtc-sh: correctly report rtc_wkalrm.enabled

This fixes the SH rtc driver to
  (a) correctly report 'enabled' status with other alarm status;
  (b) not duplicate that status in its procfs dump

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 72ba1a70f35f6def6e9468c5fd9a5f70cb5216a0..e9e0934380b8c8e1a0f594d665be11a5e625505b 100644 (file)
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -264,8 +264,6 @@ static int sh_rtc_proc(struct device *dev, struct seq_file *seq)
        unsigned int tmp;
 
        tmp = readb(rtc->regbase + RCR1);
-       seq_printf(seq, "alarm_IRQ\t: %s\n",
-                  (tmp & RCR1_AIE) ? "yes" : "no");
        seq_printf(seq, "carry_IRQ\t: %s\n",
                   (tmp & RCR1_CIE) ? "yes" : "no");
 
@@ -428,6 +426,8 @@ static int sh_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
                tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */
        tm->tm_year     = 0xffff;
 
+       wkalrm->enabled = (readb(rtc->regbase + RCR1) & RCR1_AIE) ? 1 : 0;
+
        spin_unlock_irq(&rtc->lock);
 
        return 0;