1 files changed, 18 insertions, 52 deletions

diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index c3244244e8cf..c5698cda366a 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -207,59 +207,9 @@ static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
         return 0;
 }
 
-static int vr41xx_rtc_irq_set_freq(struct device *dev, int freq)
-{
-        u64 count;
-
-        if (!is_power_of_2(freq))
-                return -EINVAL;
-        count = RTC_FREQUENCY;
-        do_div(count, freq);
-
-        spin_lock_irq(&rtc_lock);
-
-        periodic_count = count;
-        rtc1_write(RTCL1LREG, periodic_count);
-        rtc1_write(RTCL1HREG, periodic_count >> 16);
-
-        spin_unlock_irq(&rtc_lock);
-
-        return 0;
-}
-
-static int vr41xx_rtc_irq_set_state(struct device *dev, int enabled)
-{
-        if (enabled)
-                enable_irq(pie_irq);
-        else
-                disable_irq(pie_irq);
-
-        return 0;
-}
-
 static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
         switch (cmd) {
-        case RTC_AIE_ON:
-                spin_lock_irq(&rtc_lock);
-
-                if (!alarm_enabled) {
-                        enable_irq(aie_irq);
-                        alarm_enabled = 1;
-                }
-
-                spin_unlock_irq(&rtc_lock);
-                break;
-        case RTC_AIE_OFF:
-                spin_lock_irq(&rtc_lock);
-
-                if (alarm_enabled) {
-                        disable_irq(aie_irq);
-                        alarm_enabled = 0;
-                }
-
-                spin_unlock_irq(&rtc_lock);
-                break;
         case RTC_EPOCH_READ:
                 return put_user(epoch, (unsigned long __user *)arg);
         case RTC_EPOCH_SET:
@@ -275,6 +225,24 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
         return 0;
 }
 
+static int vr41xx_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        spin_lock_irq(&rtc_lock);
+        if (enabled) {
+                if (!alarm_enabled) {
+                        enable_irq(aie_irq);
+                        alarm_enabled = 1;
+                }
+        } else {
+                if (alarm_enabled) {
+                        disable_irq(aie_irq);
+                        alarm_enabled = 0;
+                }
+        }
+        spin_unlock_irq(&rtc_lock);
+        return 0;
+}
+
 static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id)
 {
         struct platform_device *pdev = (struct platform_device *)dev_id;
@@ -310,8 +278,6 @@ static const struct rtc_class_ops vr41xx_rtc_ops = {
         .set_time       = vr41xx_rtc_set_time,
         .read_alarm     = vr41xx_rtc_read_alarm,
         .set_alarm      = vr41xx_rtc_set_alarm,
-        .irq_set_freq   = vr41xx_rtc_irq_set_freq,
-        .irq_set_state  = vr41xx_rtc_irq_set_state,
 };
 
 static int __devinit rtc_probe(struct platform_device *pdev)