2023-07-13 08:40:21

by 李扬韬

Subject: [PATCH 51/58] mmc: sdhci-spear: Convert to platform remove callback returning void

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.

Cc: Uwe Kleine-König <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
drivers/mmc/host/sdhci-spear.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index c79035727b20..ec6c7d8e3736 100644
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -117,7 +117,7 @@ static int sdhci_probe(struct platform_device *pdev)
return ret;
}

-static int sdhci_remove(struct platform_device *pdev)
+static void sdhci_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct spear_sdhci *sdhci = sdhci_priv(host);
@@ -131,8 +131,6 @@ static int sdhci_remove(struct platform_device *pdev)
sdhci_remove_host(host, dead);
clk_disable_unprepare(sdhci->clk);
sdhci_free_host(host);
-
- return 0;
}

#ifdef CONFIG_PM_SLEEP
@@ -186,7 +184,7 @@ static struct platform_driver sdhci_driver = {
.of_match_table = of_match_ptr(sdhci_spear_id_table),
},
.probe = sdhci_probe,
- .remove = sdhci_remove,
+ .remove_new = sdhci_remove,
};

module_platform_driver(sdhci_driver);
--
2.39.0

2023-07-13 09:07:46

by Viresh Kumar

Subject: Re: [PATCH 51/58] mmc: sdhci-spear: Convert to platform remove callback returning void

On 13-07-23, 16:08, Yangtao Li 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.
>
> Cc: Uwe Kleine-K?nig <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> drivers/mmc/host/sdhci-spear.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
> index c79035727b20..ec6c7d8e3736 100644
> --- a/drivers/mmc/host/sdhci-spear.c
> +++ b/drivers/mmc/host/sdhci-spear.c
> @@ -117,7 +117,7 @@ static int sdhci_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int sdhci_remove(struct platform_device *pdev)
> +static void sdhci_remove(struct platform_device *pdev)
> {
> struct sdhci_host *host = platform_get_drvdata(pdev);
> struct spear_sdhci *sdhci = sdhci_priv(host);
> @@ -131,8 +131,6 @@ static int sdhci_remove(struct platform_device *pdev)
> sdhci_remove_host(host, dead);
> clk_disable_unprepare(sdhci->clk);
> sdhci_free_host(host);
> -
> - return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> @@ -186,7 +184,7 @@ static struct platform_driver sdhci_driver = {
> .of_match_table = of_match_ptr(sdhci_spear_id_table),
> },
> .probe = sdhci_probe,
> - .remove = sdhci_remove,
> + .remove_new = sdhci_remove,
> };
>
> module_platform_driver(sdhci_driver);

Acked-by: Viresh Kumar <[email protected]>

--
viresh