[PATCH 68/89] i2c: st: Convert to platform remove callback returning void

Patrice CHOTARD patrice.chotard at foss.st.com
Mon May 8 23:21:53 PDT 2023


Hi Uwe

On 5/8/23 22:52, 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-st.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c
> index f823913b75a6..25c3521cae0e 100644
> --- a/drivers/i2c/busses/i2c-st.c
> +++ b/drivers/i2c/busses/i2c-st.c
> @@ -876,13 +876,11 @@ static int st_i2c_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static int st_i2c_remove(struct platform_device *pdev)
> +static void st_i2c_remove(struct platform_device *pdev)
>  {
>  	struct st_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
>  
>  	i2c_del_adapter(&i2c_dev->adap);
> -
> -	return 0;
>  }
>  
>  static const struct of_device_id st_i2c_match[] = {
> @@ -899,7 +897,7 @@ static struct platform_driver st_i2c_driver = {
>  		.pm = pm_sleep_ptr(&st_i2c_pm),
>  	},
>  	.probe = st_i2c_probe,
> -	.remove = st_i2c_remove,
> +	.remove_new = st_i2c_remove,
>  };
>  
>  module_platform_driver(st_i2c_driver);

Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice



More information about the linux-arm-kernel mailing list