summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-09-20 09:02:12 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-09-20 09:02:12 +0200
commit1b2f03e580ff7d63fe280783707ddaad7dfdfa24 (patch)
tree7948123b2e267c823316cb21e34c90e22ef88b66 /drivers
parentd8f3ee103a9f4bd6f82a5830cfe38174864cfb86 (diff)
downloadbarebox-1b2f03e580ff7d63fe280783707ddaad7dfdfa24.tar.gz
barebox-1b2f03e580ff7d63fe280783707ddaad7dfdfa24.tar.xz
twl4030: Fix compiler warnings
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/twl4030.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/twl4030.c b/drivers/i2c/twl4030.c
index 4d47fc880d..5305ec67e3 100644
--- a/drivers/i2c/twl4030.c
+++ b/drivers/i2c/twl4030.c
@@ -51,7 +51,7 @@ int twl4030_reg_read(struct twl4030 *twl4030, u16 reg, u8 *val)
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 @@ int twl4030_reg_write(struct twl4030 *twl4030, u16 reg, u8 val)
}
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);