i2c: mv64xxx: use BIT() macro for register value definitions

[deliverable/linux.git] / drivers / i2c / busses / i2c-mv64xxx.c

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 2f64273d3f2bba63c8f930e66fad83fdf5750551..eff108cbcd4c1adccfba72b1f1ffd5e029235ce2 100644 (file)
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -30,12 +30,12 @@
 #define MV64XXX_I2C_BAUD_DIV_N(val)                    (val & 0x7)
 #define MV64XXX_I2C_BAUD_DIV_M(val)                    ((val & 0xf) << 3)
 
-#define        MV64XXX_I2C_REG_CONTROL_ACK                     0x00000004
-#define        MV64XXX_I2C_REG_CONTROL_IFLG                    0x00000008
-#define        MV64XXX_I2C_REG_CONTROL_STOP                    0x00000010
-#define        MV64XXX_I2C_REG_CONTROL_START                   0x00000020
-#define        MV64XXX_I2C_REG_CONTROL_TWSIEN                  0x00000040
-#define        MV64XXX_I2C_REG_CONTROL_INTEN                   0x00000080
+#define        MV64XXX_I2C_REG_CONTROL_ACK                     BIT(2)
+#define        MV64XXX_I2C_REG_CONTROL_IFLG                    BIT(3)
+#define        MV64XXX_I2C_REG_CONTROL_STOP                    BIT(4)
+#define        MV64XXX_I2C_REG_CONTROL_START                   BIT(5)
+#define        MV64XXX_I2C_REG_CONTROL_TWSIEN                  BIT(6)
+#define        MV64XXX_I2C_REG_CONTROL_INTEN                   BIT(7)
 
 /* Ctlr status values */
 #define        MV64XXX_I2C_STATUS_BUS_ERR                      0x00
@@ -68,16 +68,16 @@
 #define        MV64XXX_I2C_REG_BRIDGE_TIMING                   0xe0
 
 /* Bridge Control values */
-#define        MV64XXX_I2C_BRIDGE_CONTROL_WR                   0x00000001
-#define        MV64XXX_I2C_BRIDGE_CONTROL_RD                   0x00000002
+#define        MV64XXX_I2C_BRIDGE_CONTROL_WR                   BIT(0)
+#define        MV64XXX_I2C_BRIDGE_CONTROL_RD                   BIT(1)
 #define        MV64XXX_I2C_BRIDGE_CONTROL_ADDR_SHIFT           2
-#define        MV64XXX_I2C_BRIDGE_CONTROL_ADDR_EXT             0x00001000
+#define        MV64XXX_I2C_BRIDGE_CONTROL_ADDR_EXT             BIT(12)
 #define        MV64XXX_I2C_BRIDGE_CONTROL_TX_SIZE_SHIFT        13
 #define        MV64XXX_I2C_BRIDGE_CONTROL_RX_SIZE_SHIFT        16
-#define        MV64XXX_I2C_BRIDGE_CONTROL_ENABLE               0x00080000
+#define        MV64XXX_I2C_BRIDGE_CONTROL_ENABLE               BIT(19)
 
 /* Bridge Status values */
-#define        MV64XXX_I2C_BRIDGE_STATUS_ERROR                 0x00000001
+#define        MV64XXX_I2C_BRIDGE_STATUS_ERROR                 BIT(0)
 #define        MV64XXX_I2C_STATUS_OFFLOAD_ERROR                0xf0000001
 #define        MV64XXX_I2C_STATUS_OFFLOAD_OK                   0xf0000000
 
@@ -925,7 +925,6 @@ static struct platform_driver mv64xxx_i2c_driver = {
        .probe  = mv64xxx_i2c_probe,
        .remove = mv64xxx_i2c_remove,
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = MV64XXX_I2C_CTLR_NAME,
                .of_match_table = mv64xxx_i2c_of_match_table,
        },