diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-09-20 09:02:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-02 12:52:26 +0200 |
| commit | a992155c62b6686a999de33adf935cb58a52a98d (patch) | |
| tree | 49349b64cb4f3ba500a10e148765a318fb64442c | |
| parent | bd4ee84b1bad1ea7613a7e4972e708ece8f09576 (diff) | |
| download | barebox-a992155c62b6686a999de33adf935cb58a52a98d.tar.gz barebox-a992155c62b6686a999de33adf935cb58a52a98d.tar.xz | |
twl4030: Fix compiler warnings
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/i2c/twl4030.c | 6 | ||||
| -rw-r--r-- | include/i2c/twl4030.h | 2 |
2 files changed, 4 insertions, 4 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); diff --git a/include/i2c/twl4030.h b/include/i2c/twl4030.h index c9fbae0f00..3fef4d9ad6 100644 --- a/include/i2c/twl4030.h +++ b/include/i2c/twl4030.h @@ -456,6 +456,6 @@ extern struct twl4030 *twl4030_get(void); 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 */ |