summaryrefslogtreecommitdiffstats
path: root/cpu/mpc83xx/i2c.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-13 16:45:02 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-13 16:45:02 +0200
commit77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch)
treee9563b2f28ea59062b90bb5712f141e8e9798aee /cpu/mpc83xx/i2c.c
parent17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff)
downloadblackbird-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.gz
blackbird-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.zip
Cleanup for GCC-4.x
Diffstat (limited to 'cpu/mpc83xx/i2c.c')
-rw-r--r--cpu/mpc83xx/i2c.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/mpc83xx/i2c.c b/cpu/mpc83xx/i2c.c
index 3db7d2cbcd..94da4a90a9 100644
--- a/cpu/mpc83xx/i2c.c
+++ b/cpu/mpc83xx/i2c.c
@@ -110,6 +110,7 @@ i2c_wait (int write)
return 0;
} while (get_timer (timeval) < I2C_TIMEOUT);
debug("i2c_wait: timed out\n");
+ return -1;
}
static __inline__ int
@@ -231,12 +232,12 @@ int i2c_probe (uchar chip)
* and looking for an <ACK> back.
*/
udelay(10000);
- return i2c_read (chip, 0, 1, (char *)&tmp, 1);
+ return i2c_read (chip, 0, 1, (uchar *)&tmp, 1);
}
uchar i2c_reg_read (uchar i2c_addr, uchar reg)
{
- char buf[1];
+ uchar buf[1];
i2c_read (i2c_addr, reg, 1, buf, 1);
OpenPOWER on IntegriCloud