Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[sfrench/cifs-2.6.git] / drivers / rtc / rtc-s3c.c

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index e301dea57bb37fff0918791a2f6e74117c079b88..9a79a24a74874189deab5885af6ea98c6de50746 100644 (file)
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -191,6 +191,8 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
        alm_en = readb(base + S3C2410_RTCALM);
 
+       alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;
+
        pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",
                 alm_en,
                 alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
@@ -331,12 +333,8 @@ static int s3c_rtc_ioctl(struct device *dev,
 
 static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-       unsigned int rtcalm = readb(s3c_rtc_base + S3C2410_RTCALM);
        unsigned int ticnt = readb(s3c_rtc_base + S3C2410_TICNT);
 
-       seq_printf(seq, "alarm_IRQ\t: %s\n",
-                  (rtcalm & S3C2410_RTCALM_ALMEN) ? "yes" : "no" );
-
        seq_printf(seq, "periodic_IRQ\t: %s\n",
                     (ticnt & S3C2410_TICNT_ENABLE) ? "yes" : "no" );
 
@@ -352,7 +350,7 @@ static int s3c_rtc_open(struct device *dev)
        int ret;
 
        ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
-                         SA_INTERRUPT,  "s3c2410-rtc alarm", rtc_dev);
+                         IRQF_DISABLED,  "s3c2410-rtc alarm", rtc_dev);
 
        if (ret) {
                dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
@@ -360,7 +358,7 @@ static int s3c_rtc_open(struct device *dev)
        }
 
        ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
-                         SA_INTERRUPT,  "s3c2410-rtc tick", rtc_dev);
+                         IRQF_DISABLED,  "s3c2410-rtc tick", rtc_dev);
 
        if (ret) {
                dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);