[PATCH 69/89] i2c: stm32f4: Convert to platform remove callback returning void

Alain Volmat alain.volmat at foss.st.com
Tue May 9 00:24:18 PDT 2023


Hi,

Acked-by: Alain Volmat <alain.volmat at foss.st.com>

Regards,
Alain

On Mon, May 08, 2023 at 10:52:46PM +0200, Uwe Kleine-König wrote:
> The .remove() callback for a platform driver returns an int which makes
> many driver authors wrongly assume it's possible to do error handling by
> returning an error code. However the value returned is (mostly) ignored
> and this typically results in resource leaks. To improve here there is a
> quest to make the remove callback return void. In the first step of this
> quest all drivers are converted to .remove_new() which already returns
> void.
> 
> Trivially convert this driver from always returning zero in the remove
> callback to the void returning variant.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
>  drivers/i2c/busses/i2c-stm32f4.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c
> index eebce7ecef25..6ad06a5a22b4 100644
> --- a/drivers/i2c/busses/i2c-stm32f4.c
> +++ b/drivers/i2c/busses/i2c-stm32f4.c
> @@ -861,15 +861,13 @@ static int stm32f4_i2c_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> -static int stm32f4_i2c_remove(struct platform_device *pdev)
> +static void stm32f4_i2c_remove(struct platform_device *pdev)
>  {
>  	struct stm32f4_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
>  
>  	i2c_del_adapter(&i2c_dev->adap);
>  
>  	clk_unprepare(i2c_dev->clk);
> -
> -	return 0;
>  }
>  
>  static const struct of_device_id stm32f4_i2c_match[] = {
> @@ -884,7 +882,7 @@ static struct platform_driver stm32f4_i2c_driver = {
>  		.of_match_table = stm32f4_i2c_match,
>  	},
>  	.probe = stm32f4_i2c_probe,
> -	.remove = stm32f4_i2c_remove,
> +	.remove_new = stm32f4_i2c_remove,
>  };
>  
>  module_platform_driver(stm32f4_i2c_driver);
> -- 
> 2.39.2
> 



More information about the linux-arm-kernel mailing list