arm: socfpga: config: Zap incorrect config options

[u-boot] / drivers / i2c / ihs_i2c.c

diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index ecc5856b936181a5f96b39bdfafa258598531a75..19fbe596f4bdced2cb1f5aba65d68ba285704490 100644 (file)
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -34,7 +34,6 @@ static int wait_for_int(bool read)
               | (read ? I2CINT_RECEIVE_EV : I2CINT_TRANSMIT_EV)))) {
                udelay(10);
                if (ctr++ > 5000) {
-                       printf("I2C timeout\n");
                        return 1;
                }
                FPGA_GET_REG(I2C_ADAP_HWNR, i2c.interrupt_status, &val);
@@ -85,7 +84,7 @@ static int ihs_i2c_address(uchar chip, uint addr, int alen, bool hold_bus)
        int shift = (alen-1) * 8;
 
        while (alen) {
-               int transfer = MIN(alen, 2);
+               int transfer = min(alen, 2);
                uchar buf[2];
                bool is_last = alen <= transfer;
 
@@ -114,7 +113,7 @@ static int ihs_i2c_access(struct i2c_adapter *adap, uchar chip, uint addr,
                return 1;
 
        while (len) {
-               int transfer = MIN(len, 2);
+               int transfer = min(len, 2);
 
                if (ihs_i2c_transfer(chip, buffer, transfer, read,
                                     len <= transfer))