[PATCH 01/15] PCI: aardvark: Convert to platform remove callback returning void

Pali Rohár pali at kernel.org
Tue Mar 21 12:36:04 PDT 2023


On Tuesday 21 March 2023 20:31:54 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.

There are more important fixes for this driver waiting on the list, so I
do not see reason for sending such unimportant change for this driver
which does not fix any issue. I would suggest to put this change at the
end of the pending queue of aardvark patches to prevent any rebasing of
the important fixes patches and possible merge conflicts.

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
>  drivers/pci/controller/pci-aardvark.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
> index 513d8edf3a5c..71ecd7ddcc8a 100644
> --- a/drivers/pci/controller/pci-aardvark.c
> +++ b/drivers/pci/controller/pci-aardvark.c
> @@ -1927,7 +1927,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static int advk_pcie_remove(struct platform_device *pdev)
> +static void advk_pcie_remove(struct platform_device *pdev)
>  {
>  	struct advk_pcie *pcie = platform_get_drvdata(pdev);
>  	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
> @@ -1989,8 +1989,6 @@ static int advk_pcie_remove(struct platform_device *pdev)
>  
>  	/* Disable phy */
>  	advk_pcie_disable_phy(pcie);
> -
> -	return 0;
>  }
>  
>  static const struct of_device_id advk_pcie_of_match_table[] = {
> @@ -2005,7 +2003,7 @@ static struct platform_driver advk_pcie_driver = {
>  		.of_match_table = advk_pcie_of_match_table,
>  	},
>  	.probe = advk_pcie_probe,
> -	.remove = advk_pcie_remove,
> +	.remove_new = advk_pcie_remove,
>  };
>  module_platform_driver(advk_pcie_driver);
>  
> -- 
> 2.39.2
> 



More information about the linux-arm-kernel mailing list