1 files changed, 9 insertions, 41 deletions

diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 90cf0a6ff23e..85c1b848dd72 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -207,7 +207,7 @@ static int rs5c372_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
         struct rs5c372  *rs5c = i2c_get_clientdata(client);
-        unsigned char   buf[8];
+        unsigned char   buf[7];
         int             addr;
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d "
@@ -281,10 +281,8 @@ static int rs5c372_rtc_set_time(struct device *dev, struct rtc_time *tm)
         return rs5c372_set_datetime(to_i2c_client(dev), tm);
 }
 
-#if defined(CONFIG_RTC_INTF_DEV) || defined(CONFIG_RTC_INTF_DEV_MODULE)
 
-static int
-rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+static int rs5c_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct i2c_client       *client = to_i2c_client(dev);
         struct rs5c372          *rs5c = i2c_get_clientdata(client);
@@ -292,45 +290,19 @@ rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
         int                     status, addr;
 
         buf = rs5c->regs[RS5C_REG_CTRL1];
-        switch (cmd) {
-        case RTC_UIE_OFF:
-        case RTC_UIE_ON:
-                /* some 327a modes use a different IRQ pin for 1Hz irqs */
-                if (rs5c->type == rtc_rs5c372a
-                                && (buf & RS5C372A_CTRL1_SL1))
-                        return -ENOIOCTLCMD;
-        case RTC_AIE_OFF:
-        case RTC_AIE_ON:
-                /* these irq management calls only make sense for chips
-                 * which are wired up to an IRQ.
-                 */
-                if (!rs5c->has_irq)
-                        return -ENOIOCTLCMD;
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
+
+        if (!rs5c->has_irq)
+                return -EINVAL;
 
         status = rs5c_get_regs(rs5c);
         if (status < 0)
                 return status;
 
         addr = RS5C_ADDR(RS5C_REG_CTRL1);
-        switch (cmd) {
-        case RTC_AIE_OFF:       /* alarm off */
-                buf &= ~RS5C_CTRL1_AALE;
-                break;
-        case RTC_AIE_ON:        /* alarm on */
+        if (enabled)
                 buf |= RS5C_CTRL1_AALE;
-                break;
-        case RTC_UIE_OFF:       /* update off */
-                buf &= ~RS5C_CTRL1_CT_MASK;
-                break;
-        case RTC_UIE_ON:        /* update on */
-                buf &= ~RS5C_CTRL1_CT_MASK;
-                buf |= RS5C_CTRL1_CT4;
-                break;
-        }
+        else
+                buf &= ~RS5C_CTRL1_AALE;
 
         if (i2c_smbus_write_byte_data(client, addr, buf) < 0) {
                 printk(KERN_WARNING "%s: can't update alarm\n",
@@ -342,10 +314,6 @@ rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
         return status;
 }
 
-#else
-#define rs5c_rtc_ioctl  NULL
-#endif
-
 
 /* NOTE:  Since RTC_WKALM_{RD,SET} were originally defined for EFI,
  * which only exposes a polled programming interface; and since
@@ -461,11 +429,11 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq)
 
 static const struct rtc_class_ops rs5c372_rtc_ops = {
         .proc           = rs5c372_rtc_proc,
-        .ioctl          = rs5c_rtc_ioctl,
         .read_time      = rs5c372_rtc_read_time,
         .set_time       = rs5c372_rtc_set_time,
         .read_alarm     = rs5c_read_alarm,
         .set_alarm      = rs5c_set_alarm,
+        .alarm_irq_enable = rs5c_rtc_alarm_irq_enable,
 };
 
 #if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE)