A few cleanup, removal of unnecessary messages regarding bus busy
and recovering bus.
Make the function stm32f7_i2c_release_bus void since it is never
returning any error message, allowing to get rid of the error handling
within the calling function.
Alain Volmat (1):
i2c: stm32: get rid of stm32f7_i2c_release_bus return value
Wolfram Sang (1):
i2c: stm32f7: remove noisy and imprecise log messages
drivers/i2c/busses/i2c-stm32f7.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
--
2.25.1
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 <[email protected]>
---
drivers/i2c/busses/i2c-stm32f7.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 66145d2b9b55..fcf43b3ac64f 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;
}
--
2.25.1
From: Wolfram Sang <[email protected]>
The log messages talk about 'bus recovery' while it is not a bus
recovery with 9 pulses but merely a controller reset. Controller resets
are not worth log messages. The 'bus busy' message should be emitted by
upper layers, a busy bus may be expected in some cases.
Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Alain Volmat <[email protected]>
---
v2: s/expectected/expected
reworked on top of patch making stm32f7_i2c_release_bus a void
function
drivers/i2c/busses/i2c-stm32f7.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index fcf43b3ac64f..6d4aa64b195d 100644
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -832,8 +832,6 @@ 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);
@@ -852,8 +850,6 @@ 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");
-
stm32f7_i2c_release_bus(&i2c_dev->adap);
return -EBUSY;
--
2.25.1
Sorry for the noise. Issue with my mailer. Will resend properly
the same serie in a sec.
On Wed, Dec 01, 2021 at 12:03:46PM +0100, Alain VOLMAT wrote:
> A few cleanup, removal of unnecessary messages regarding bus busy
> and recovering bus.
> Make the function stm32f7_i2c_release_bus void since it is never
> returning any error message, allowing to get rid of the error handling
> within the calling function.
>
> Alain Volmat (1):
> i2c: stm32: get rid of stm32f7_i2c_release_bus return value
>
> Wolfram Sang (1):
> i2c: stm32f7: remove noisy and imprecise log messages
>
> drivers/i2c/busses/i2c-stm32f7.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> --
> 2.25.1
>