[PATCH 36/87] spi: microchip-core-qspi: Convert to platform remove callback returning void

Conor Dooley conor at kernel.org
Fri Mar 3 09:45:08 PST 2023


On Fri, Mar 03, 2023 at 06:19:50PM +0100, 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: Conor Dooley <conor.dooley at microchip.com>

Thanks,
Conor.

> ---
>  drivers/spi/spi-microchip-core-qspi.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microchip-core-qspi.c
> index 19a6a46829f6..4f76ddf97b10 100644
> --- a/drivers/spi/spi-microchip-core-qspi.c
> +++ b/drivers/spi/spi-microchip-core-qspi.c
> @@ -566,7 +566,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> -static int mchp_coreqspi_remove(struct platform_device *pdev)
> +static void mchp_coreqspi_remove(struct platform_device *pdev)
>  {
>  	struct mchp_coreqspi *qspi = platform_get_drvdata(pdev);
>  	u32 control = readl_relaxed(qspi->regs + REG_CONTROL);
> @@ -575,8 +575,6 @@ static int mchp_coreqspi_remove(struct platform_device *pdev)
>  	control &= ~CONTROL_ENABLE;
>  	writel_relaxed(control, qspi->regs + REG_CONTROL);
>  	clk_disable_unprepare(qspi->clk);
> -
> -	return 0;
>  }
>  
>  static const struct of_device_id mchp_coreqspi_of_match[] = {
> @@ -591,7 +589,7 @@ static struct platform_driver mchp_coreqspi_driver = {
>  		.name = "microchip,coreqspi",
>  		.of_match_table = mchp_coreqspi_of_match,
>  	},
> -	.remove = mchp_coreqspi_remove,
> +	.remove_new = mchp_coreqspi_remove,
>  };
>  module_platform_driver(mchp_coreqspi_driver);
>  
> -- 
> 2.39.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-riscv/attachments/20230303/5aeb849c/attachment.sig>


More information about the linux-riscv mailing list