diff options
| author | Alain Volmat <alain.volmat@foss.st.com> | 2021-12-01 12:47:50 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2021-12-01 22:14:01 +0100 |
| commit | 05907656b94f6c1b96cbcc3063a683f4c580b63a (patch) | |
| tree | 9acf990c88b9bf3efbf73296f71fbffa5cfc2952 /drivers/i2c | |
| parent | 1071d1ad31503cd45fabcdb5bfa778508f68f3a0 (diff) | |
| download | lwn-05907656b94f6c1b96cbcc3063a683f4c580b63a.tar.gz lwn-05907656b94f6c1b96cbcc3063a683f4c580b63a.zip | |
i2c: stm32: get rid of stm32f7_i2c_release_bus return value
Function stm32f7_i2c_release_bus is always returning 0, hence it
should be a void function. Update the function and remove the
return value error checking code in caller functions.
Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-stm32f7.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index b9b19a2a2ffa..9b713c50abb8 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -828,7 +828,7 @@ 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); @@ -838,8 +838,6 @@ static int stm32f7_i2c_release_bus(struct i2c_adapter *i2c_adap) 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) @@ -856,11 +854,7 @@ static int stm32f7_i2c_wait_free_bus(struct stm32f7_i2c_dev *i2c_dev) 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; } |