Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / i2c / busses / i2c-stm32f7.c

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 66145d2..6d4aa64 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -828,18 +828,14 @@ static void stm32f7_i2c_smbus_reload(struct stm32f7_i2c_dev *i2c_dev)
        writel_relaxed(cr2, i2c_dev->base + STM32F7_I2C_CR2);
 }
 
-static int stm32f7_i2c_release_bus(struct i2c_adapter *i2c_adap)
+static void stm32f7_i2c_release_bus(struct i2c_adapter *i2c_adap)
 {
        struct stm32f7_i2c_dev *i2c_dev = i2c_get_adapdata(i2c_adap);
 
-       dev_info(i2c_dev->dev, "Trying to recover bus\n");
-
        stm32f7_i2c_clr_bits(i2c_dev->base + STM32F7_I2C_CR1,
                             STM32F7_I2C_CR1_PE);
 
        stm32f7_i2c_hw_config(i2c_dev);
-
-       return 0;
 }
 
 static int stm32f7_i2c_wait_free_bus(struct stm32f7_i2c_dev *i2c_dev)
@@ -854,13 +850,7 @@ static int stm32f7_i2c_wait_free_bus(struct stm32f7_i2c_dev *i2c_dev)
        if (!ret)
                return 0;
 
-       dev_info(i2c_dev->dev, "bus busy\n");
-
-       ret = stm32f7_i2c_release_bus(&i2c_dev->adap);
-       if (ret) {
-               dev_err(i2c_dev->dev, "Failed to recover the bus (%d)\n", ret);
-               return ret;
-       }
+       stm32f7_i2c_release_bus(&i2c_dev->adap);
 
        return -EBUSY;
 }