[PATCH 41/89] i2c: mt65xx: Convert to platform remove callback returning void

Matthias Brugger matthias.bgg at gmail.com
Wed May 10 09:55:47 PDT 2023



On 08/05/2023 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>

Reviewed-by: Matthias Brugger <matthias.bgg at gmail.com>

> ---
>   drivers/i2c/busses/i2c-mt65xx.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
> index a43c4d77739a..7ca3f2221ba6 100644
> --- a/drivers/i2c/busses/i2c-mt65xx.c
> +++ b/drivers/i2c/busses/i2c-mt65xx.c
> @@ -1505,15 +1505,13 @@ static int mtk_i2c_probe(struct platform_device *pdev)
>   	return ret;
>   }
>   
> -static int mtk_i2c_remove(struct platform_device *pdev)
> +static void mtk_i2c_remove(struct platform_device *pdev)
>   {
>   	struct mtk_i2c *i2c = platform_get_drvdata(pdev);
>   
>   	i2c_del_adapter(&i2c->adap);
>   
>   	clk_bulk_unprepare(I2C_MT65XX_CLK_MAX, i2c->clocks);
> -
> -	return 0;
>   }
>   
>   #ifdef CONFIG_PM_SLEEP
> @@ -1555,7 +1553,7 @@ static const struct dev_pm_ops mtk_i2c_pm = {
>   
>   static struct platform_driver mtk_i2c_driver = {
>   	.probe = mtk_i2c_probe,
> -	.remove = mtk_i2c_remove,
> +	.remove_new = mtk_i2c_remove,
>   	.driver = {
>   		.name = I2C_DRV_NAME,
>   		.pm = &mtk_i2c_pm,



More information about the linux-arm-kernel mailing list