Commit 05907656 authored by Alain Volmat's avatar Alain Volmat Committed by Wolfram Sang
Browse files

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: default avatarAlain Volmat <alain.volmat@foss.st.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 1071d1ad

drivers/i2c/busses/i2c-stm32f7.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

}