1 files changed, 9 insertions, 36 deletions

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 73377b0d65d..de0dd7b1f14 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -135,42 +135,17 @@ static irqreturn_t rtc_irq(int irq, void *rtc)
         return IRQ_HANDLED;
 }
 
-#ifdef  CONFIG_RTC_INTF_DEV
-
-static int
-omap_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+static int omap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         u8 reg;
 
-        switch (cmd) {
-        case RTC_AIE_OFF:
-        case RTC_AIE_ON:
-        case RTC_UIE_OFF:
-        case RTC_UIE_ON:
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
-
         local_irq_disable();
         rtc_wait_not_busy();
         reg = rtc_read(OMAP_RTC_INTERRUPTS_REG);
-        switch (cmd) {
-        /* AIE = Alarm Interrupt Enable */
-        case RTC_AIE_OFF:
-                reg &= ~OMAP_RTC_INTERRUPTS_IT_ALARM;
-                break;
-        case RTC_AIE_ON:
+        if (enabled)
                 reg |= OMAP_RTC_INTERRUPTS_IT_ALARM;
-                break;
-        /* UIE = Update Interrupt Enable (1/second) */
-        case RTC_UIE_OFF:
-                reg &= ~OMAP_RTC_INTERRUPTS_IT_TIMER;
-                break;
-        case RTC_UIE_ON:
-                reg |= OMAP_RTC_INTERRUPTS_IT_TIMER;
-                break;
-        }
+        else
+                reg &= ~OMAP_RTC_INTERRUPTS_IT_ALARM;
         rtc_wait_not_busy();
         rtc_write(reg, OMAP_RTC_INTERRUPTS_REG);
         local_irq_enable();
@@ -178,10 +153,6 @@ omap_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
         return 0;
 }
 
-#else
-#define omap_rtc_ioctl  NULL
-#endif
-
 /* this hardware doesn't support "don't care" alarm fields */
 static int tm2bcd(struct rtc_time *tm)
 {
@@ -304,11 +275,11 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 }
 
 static struct rtc_class_ops omap_rtc_ops = {
-        .ioctl          = omap_rtc_ioctl,
         .read_time      = omap_rtc_read_time,
         .set_time       = omap_rtc_set_time,
         .read_alarm     = omap_rtc_read_alarm,
         .set_alarm      = omap_rtc_set_alarm,
+        .alarm_irq_enable = omap_rtc_alarm_irq_enable,
 };
 
 static int omap_rtc_alarm;
@@ -429,13 +400,14 @@ fail1:
 fail0:
         iounmap(rtc_base);
 fail:
-        release_resource(mem);
+        release_mem_region(mem->start, resource_size(mem));
         return -EIO;
 }
 
 static int __exit omap_rtc_remove(struct platform_device *pdev)
 {
         struct rtc_device       *rtc = platform_get_drvdata(pdev);
+        struct resource         *mem = dev_get_drvdata(&rtc->dev);
 
         device_init_wakeup(&pdev->dev, 0);
 
@@ -447,8 +419,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
         if (omap_rtc_timer != omap_rtc_alarm)
                 free_irq(omap_rtc_alarm, rtc);
 
-        release_resource(dev_get_drvdata(&rtc->dev));
         rtc_device_unregister(rtc);
+        iounmap(rtc_base);
+        release_mem_region(mem->start, resource_size(mem));
         return 0;
 }