Cleanup for GCC-4.x

[oweals/u-boot.git] / cpu / mpc83xx / i2c.c

diff --git a/cpu/mpc83xx/i2c.c b/cpu/mpc83xx/i2c.c
index 3db7d2cbcdca6297b6231ff6e0469669b33056b3..94da4a90a958224482ae2d09553fe6a96896cdb4 100644 (file)
--- 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);