[PATCH 75/87] spi: sun6i: Convert to platform remove callback returning void

Andre Przywara andre.przywara at arm.com
Fri Mar 3 09:30:15 PST 2023


On Fri,  3 Mar 2023 18:20:29 +0100
Uwe Kleine-König <u.kleine-koenig at pengutronix.de> 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: Andre Przywara <andre.przywara at arm.com>

Cheers,
Andre

> ---
>  drivers/spi/spi-sun6i.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
> index 23ad052528db..43c29afea6bb 100644
> --- a/drivers/spi/spi-sun6i.c
> +++ b/drivers/spi/spi-sun6i.c
> @@ -683,7 +683,7 @@ static int sun6i_spi_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> -static int sun6i_spi_remove(struct platform_device *pdev)
> +static void sun6i_spi_remove(struct platform_device *pdev)
>  {
>  	struct spi_master *master = platform_get_drvdata(pdev);
>  
> @@ -693,7 +693,6 @@ static int sun6i_spi_remove(struct platform_device *pdev)
>  		dma_release_channel(master->dma_tx);
>  	if (master->dma_rx)
>  		dma_release_channel(master->dma_rx);
> -	return 0;
>  }
>  
>  static const struct of_device_id sun6i_spi_match[] = {
> @@ -710,7 +709,7 @@ static const struct dev_pm_ops sun6i_spi_pm_ops = {
>  
>  static struct platform_driver sun6i_spi_driver = {
>  	.probe	= sun6i_spi_probe,
> -	.remove	= sun6i_spi_remove,
> +	.remove_new = sun6i_spi_remove,
>  	.driver	= {
>  		.name		= "sun6i-spi",
>  		.of_match_table	= sun6i_spi_match,




More information about the linux-arm-kernel mailing list