1 files changed, 6 insertions, 35 deletions

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index e72b523c79a5..bcae8dd41496 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;
@@ -423,7 +394,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
         return 0;
 
 fail2:
-        free_irq(omap_rtc_timer, NULL);
+        free_irq(omap_rtc_timer, rtc);
 fail1:
         rtc_device_unregister(rtc);
 fail0: