1 files changed, 25 insertions, 54 deletions

diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index bcd0cf63eb16..b2f096871a97 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -62,6 +62,17 @@ static inline int is_intr(u8 rtc_intr)
         return rtc_intr & RTC_IRQMASK;
 }
 
+static inline unsigned char vrtc_is_updating(void)
+{
+        unsigned char uip;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+        uip = (vrtc_cmos_read(RTC_FREQ_SELECT) & RTC_UIP);
+        spin_unlock_irqrestore(&rtc_lock, flags);
+        return uip;
+}
+
 /*
  * rtc_time's year contains the increment over 1900, but vRTC's YEAR
  * register can't be programmed to value larger than 0x64, so vRTC
@@ -76,7 +87,7 @@ static int mrst_read_time(struct device *dev, struct rtc_time *time)
 {
         unsigned long flags;
 
-        if (rtc_is_updating())
+        if (vrtc_is_updating())
                 mdelay(20);
 
         spin_lock_irqsave(&rtc_lock, flags);
@@ -236,61 +247,21 @@ static int mrst_set_alarm(struct device *dev, struct rtc_wkalrm *t)
         return 0;
 }
 
-static int mrst_irq_set_state(struct device *dev, int enabled)
+/* Currently, the vRTC doesn't support UIE ON/OFF */
+static int mrst_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct mrst_rtc *mrst = dev_get_drvdata(dev);
         unsigned long   flags;
 
-        if (!mrst->irq)
-                return -ENXIO;
-
         spin_lock_irqsave(&rtc_lock, flags);
-
         if (enabled)
-                mrst_irq_enable(mrst, RTC_PIE);
+                mrst_irq_enable(mrst, RTC_AIE);
         else
-                mrst_irq_disable(mrst, RTC_PIE);
-
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return 0;
-}
-
-#if defined(CONFIG_RTC_INTF_DEV) || defined(CONFIG_RTC_INTF_DEV_MODULE)
-
-/* Currently, the vRTC doesn't support UIE ON/OFF */
-static int
-mrst_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
-{
-        struct mrst_rtc *mrst = dev_get_drvdata(dev);
-        unsigned long   flags;
-
-        switch (cmd) {
-        case RTC_AIE_OFF:
-        case RTC_AIE_ON:
-                if (!mrst->irq)
-                        return -EINVAL;
-                break;
-        default:
-                /* PIE ON/OFF is handled by mrst_irq_set_state() */
-                return -ENOIOCTLCMD;
-        }
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        switch (cmd) {
-        case RTC_AIE_OFF:       /* alarm off */
                 mrst_irq_disable(mrst, RTC_AIE);
-                break;
-        case RTC_AIE_ON:        /* alarm on */
-                mrst_irq_enable(mrst, RTC_AIE);
-                break;
-        }
         spin_unlock_irqrestore(&rtc_lock, flags);
         return 0;
 }
 
-#else
-#define mrst_rtc_ioctl  NULL
-#endif
 
 #if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE)
 
@@ -317,13 +288,12 @@ static int mrst_procfs(struct device *dev, struct seq_file *seq)
 #endif
 
 static const struct rtc_class_ops mrst_rtc_ops = {
-        .ioctl          = mrst_rtc_ioctl,
         .read_time      = mrst_read_time,
         .set_time       = mrst_set_time,
         .read_alarm     = mrst_read_alarm,
         .set_alarm      = mrst_set_alarm,
         .proc           = mrst_procfs,
-        .irq_set_state  = mrst_irq_set_state,
+        .alarm_irq_enable = mrst_rtc_alarm_irq_enable,
 };
 
 static struct mrst_rtc  mrst_rtc;
@@ -349,7 +319,7 @@ static irqreturn_t mrst_rtc_irq(int irq, void *p)
         return IRQ_NONE;
 }
 
-static int __init
+static int __devinit
 vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
 {
         int retval = 0;
@@ -372,6 +342,8 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
 
         mrst_rtc.irq = rtc_irq;
         mrst_rtc.iomem = iomem;
+        mrst_rtc.dev = dev;
+        dev_set_drvdata(dev, &mrst_rtc);
 
         mrst_rtc.rtc = rtc_device_register(driver_name, dev,
                                 &mrst_rtc_ops, THIS_MODULE);
@@ -380,8 +352,6 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
                 goto cleanup0;
         }
 
-        mrst_rtc.dev = dev;
-        dev_set_drvdata(dev, &mrst_rtc);
         rename_region(iomem, dev_name(&mrst_rtc.rtc->dev));
 
         spin_lock_irq(&rtc_lock);
@@ -406,9 +376,10 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
         return 0;
 
 cleanup1:
-        mrst_rtc.dev = NULL;
         rtc_device_unregister(mrst_rtc.rtc);
 cleanup0:
+        dev_set_drvdata(dev, NULL);
+        mrst_rtc.dev = NULL;
         release_region(iomem->start, iomem->end + 1 - iomem->start);
         dev_err(dev, "rtc-mrst: unable to initialise\n");
         return retval;
@@ -421,7 +392,7 @@ static void rtc_mrst_do_shutdown(void)
         spin_unlock_irq(&rtc_lock);
 }
 
-static void __exit rtc_mrst_do_remove(struct device *dev)
+static void __devexit rtc_mrst_do_remove(struct device *dev)
 {
         struct mrst_rtc *mrst = dev_get_drvdata(dev);
         struct resource *iomem;
@@ -530,14 +501,14 @@ static inline int mrst_poweroff(struct device *dev)
 
 #endif
 
-static int __init vrtc_mrst_platform_probe(struct platform_device *pdev)
+static int __devinit vrtc_mrst_platform_probe(struct platform_device *pdev)
 {
         return vrtc_mrst_do_probe(&pdev->dev,
                         platform_get_resource(pdev, IORESOURCE_MEM, 0),
                         platform_get_irq(pdev, 0));
 }
 
-static int __exit vrtc_mrst_platform_remove(struct platform_device *pdev)
+static int __devexit vrtc_mrst_platform_remove(struct platform_device *pdev)
 {
         rtc_mrst_do_remove(&pdev->dev);
         return 0;
@@ -555,7 +526,7 @@ MODULE_ALIAS("platform:vrtc_mrst");
 
 static struct platform_driver vrtc_mrst_platform_driver = {
         .probe          = vrtc_mrst_platform_probe,
-        .remove         = __exit_p(vrtc_mrst_platform_remove),
+        .remove         = __devexit_p(vrtc_mrst_platform_remove),
         .shutdown       = vrtc_mrst_platform_shutdown,
         .driver = {
                 .name           = (char *) driver_name,