1 files changed, 20 insertions, 23 deletions

diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 916cdc1af23c..ceaa6b0bdfd6 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -14,6 +14,7 @@
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/bcd.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/string.h>
@@ -52,9 +53,6 @@ static inline u8 _rtc8564_ctrl2(struct i2c_client *client)
 #define CTRL1(c) _rtc8564_ctrl1(c)
 #define CTRL2(c) _rtc8564_ctrl2(c)
 
-#define BCD_TO_BIN(val) (((val)&15) + ((val)>>4)*10)
-#define BIN_TO_BCD(val) ((((val)/10)<<4) + (val)%10)
-
 static int debug;;
 module_param(debug, int, S_IRUGO | S_IWUSR);
 
@@ -157,7 +155,6 @@ static int rtc8564_attach(struct i2c_adapter *adap, int addr, int kind)
 
         strlcpy(new_client->name, "RTC8564", I2C_NAME_SIZE);
         i2c_set_clientdata(new_client, d);
-        new_client->flags = I2C_CLIENT_ALLOW_USE;
         new_client->addr = addr;
         new_client->adapter = adap;
         new_client->driver = &rtc8564_driver;
@@ -224,16 +221,16 @@ static int rtc8564_get_datetime(struct i2c_client *client, struct rtc_tm *dt)
                 return ret;
 
         /* century stored in minute alarm reg */
-        dt->year = BCD_TO_BIN(buf[RTC8564_REG_YEAR]);
-        dt->year += 100 * BCD_TO_BIN(buf[RTC8564_REG_AL_MIN] & 0x3f);
-        dt->mday = BCD_TO_BIN(buf[RTC8564_REG_DAY] & 0x3f);
-        dt->wday = BCD_TO_BIN(buf[RTC8564_REG_WDAY] & 7);
-        dt->mon = BCD_TO_BIN(buf[RTC8564_REG_MON_CENT] & 0x1f);
+        dt->year = BCD2BIN(buf[RTC8564_REG_YEAR]);
+        dt->year += 100 * BCD2BIN(buf[RTC8564_REG_AL_MIN] & 0x3f);
+        dt->mday = BCD2BIN(buf[RTC8564_REG_DAY] & 0x3f);
+        dt->wday = BCD2BIN(buf[RTC8564_REG_WDAY] & 7);
+        dt->mon = BCD2BIN(buf[RTC8564_REG_MON_CENT] & 0x1f);
 
-        dt->secs = BCD_TO_BIN(buf[RTC8564_REG_SEC] & 0x7f);
+        dt->secs = BCD2BIN(buf[RTC8564_REG_SEC] & 0x7f);
         dt->vl = (buf[RTC8564_REG_SEC] & 0x80) == 0x80;
-        dt->mins = BCD_TO_BIN(buf[RTC8564_REG_MIN] & 0x7f);
-        dt->hours = BCD_TO_BIN(buf[RTC8564_REG_HR] & 0x3f);
+        dt->mins = BCD2BIN(buf[RTC8564_REG_MIN] & 0x7f);
+        dt->hours = BCD2BIN(buf[RTC8564_REG_HR] & 0x3f);
 
         _DBGRTCTM(2, *dt);
 
@@ -255,18 +252,18 @@ rtc8564_set_datetime(struct i2c_client *client, struct rtc_tm *dt, int datetoo)
 
         buf[RTC8564_REG_CTRL1] = CTRL1(client) | RTC8564_CTRL1_STOP;
         buf[RTC8564_REG_CTRL2] = CTRL2(client);
-        buf[RTC8564_REG_SEC] = BIN_TO_BCD(dt->secs);
-        buf[RTC8564_REG_MIN] = BIN_TO_BCD(dt->mins);
-        buf[RTC8564_REG_HR] = BIN_TO_BCD(dt->hours);
+        buf[RTC8564_REG_SEC] = BIN2BCD(dt->secs);
+        buf[RTC8564_REG_MIN] = BIN2BCD(dt->mins);
+        buf[RTC8564_REG_HR] = BIN2BCD(dt->hours);
 
         if (datetoo) {
                 len += 5;
-                buf[RTC8564_REG_DAY] = BIN_TO_BCD(dt->mday);
-                buf[RTC8564_REG_WDAY] = BIN_TO_BCD(dt->wday);
-                buf[RTC8564_REG_MON_CENT] = BIN_TO_BCD(dt->mon) & 0x1f;
+                buf[RTC8564_REG_DAY] = BIN2BCD(dt->mday);
+                buf[RTC8564_REG_WDAY] = BIN2BCD(dt->wday);
+                buf[RTC8564_REG_MON_CENT] = BIN2BCD(dt->mon) & 0x1f;
                 /* century stored in minute alarm reg */
-                buf[RTC8564_REG_YEAR] = BIN_TO_BCD(dt->year % 100);
-                buf[RTC8564_REG_AL_MIN] = BIN_TO_BCD(dt->year / 100);
+                buf[RTC8564_REG_YEAR] = BIN2BCD(dt->year % 100);
+                buf[RTC8564_REG_AL_MIN] = BIN2BCD(dt->year / 100);
         }
 
         ret = rtc8564_write(client, 0, buf, len);
@@ -361,10 +358,10 @@ rtc8564_command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 
 static struct i2c_driver rtc8564_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "RTC8564",
+        .driver = {
+                .name   = "RTC8564",
+        },
         .id             = I2C_DRIVERID_RTC8564,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = rtc8564_probe,
         .detach_client  = rtc8564_detach,
         .command        = rtc8564_command