diff --git a/drivers/i2c/twl4030.c b/drivers/i2c/twl4030.c
index 4d47fc8..5305ec6 100644
--- a/drivers/i2c/twl4030.c
+++ b/drivers/i2c/twl4030.c
@@ -51,7 +51,7 @@
 	msg->flags = I2C_M_RD;	/* Read the register value */
 	msg->len = 1;	/* only n bytes */
 	msg->buf = val;
-	ret = i2c_transfer(twl4030->client->adapter, &xfer_msg, 2);
+	ret = i2c_transfer(twl4030->client->adapter, xfer_msg, 2);
 
 	/* i2c_transfer returns number of messages transferred */
 	if (ret < 0) {
@@ -96,9 +96,9 @@
 }
 EXPORT_SYMBOL(twl4030_reg_write)
 
-int twl4030_set_bits(struct twl4030 *twl4030, enum twl4030_reg reg, u32 mask, u32 val)
+int twl4030_set_bits(struct twl4030 *twl4030, enum twl4030_reg reg, u8 mask, u8 val)
 {
-	u32 tmp;
+	u8 tmp;
 	int err;
 
 	err = twl4030_reg_read(twl4030, reg, &tmp);
diff --git a/include/i2c/twl4030.h b/include/i2c/twl4030.h
index c9fbae0..3fef4d9 100644
--- a/include/i2c/twl4030.h
+++ b/include/i2c/twl4030.h
@@ -456,6 +456,6 @@
 
 extern int twl4030_reg_read(struct twl4030 *twl4030, u16 reg, u8 *val);
 extern int twl4030_reg_write(struct twl4030 *twl4030, u16 reg, u8 val);
-extern int twl4030_set_bits(struct twl4030 *twl4030, enum twl4030_reg reg, u32 mask, u32 val);
+extern int twl4030_set_bits(struct twl4030 *twl4030, enum twl4030_reg reg, u8 mask, u8 val);
 
 #endif /* __I2C_TWL4030_H */