On 13/07/23 11: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 <u.kleine-koenig@xxxxxxxxxxxxxx>
> Signed-off-by: Yangtao Li <frank.li@xxxxxxxx>
> ---
> drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
> drivers/mmc/host/sdhci-brcmstb.c | 2 +-
> drivers/mmc/host/sdhci-cadence.c | 2 +-
> drivers/mmc/host/sdhci-dove.c | 2 +-
> drivers/mmc/host/sdhci-iproc.c | 2 +-
> drivers/mmc/host/sdhci-of-esdhc.c | 2 +-
> drivers/mmc/host/sdhci-of-hlwd.c | 2 +-
> drivers/mmc/host/sdhci-of-sparx5.c | 2 +-
> drivers/mmc/host/sdhci-pltfm.c | 4 +---
> drivers/mmc/host/sdhci-pltfm.h | 2 +-
> drivers/mmc/host/sdhci-pxav2.c | 2 +-
Looks like drivers/mmc/host/sdhci-npcm.c was missed
> 11 files changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
> index 6a93a54fe067..2e3736603853 100644
> --- a/drivers/mmc/host/sdhci-bcm-kona.c
> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
> @@ -319,7 +319,7 @@ static struct platform_driver sdhci_bcm_kona_driver = {
> .of_match_table = sdhci_bcm_kona_of_match,
> },
> .probe = sdhci_bcm_kona_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
> module_platform_driver(sdhci_bcm_kona_driver);
>
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index 4c22337199cf..a2b6d8f2eeb6 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -430,7 +430,7 @@ static struct platform_driver sdhci_brcmstb_driver = {
> .of_match_table = of_match_ptr(sdhci_brcm_of_match),
> },
> .probe = sdhci_brcmstb_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> .shutdown = sdhci_brcmstb_shutdown,
> };
>
> diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
> index d2f625054689..1702a499b36a 100644
> --- a/drivers/mmc/host/sdhci-cadence.c
> +++ b/drivers/mmc/host/sdhci-cadence.c
> @@ -617,7 +617,7 @@ static struct platform_driver sdhci_cdns_driver = {
> .of_match_table = sdhci_cdns_match,
> },
> .probe = sdhci_cdns_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
> module_platform_driver(sdhci_cdns_driver);
>
> diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
> index 5e5bf82e5976..75335dbf223c 100644
> --- a/drivers/mmc/host/sdhci-dove.c
> +++ b/drivers/mmc/host/sdhci-dove.c
> @@ -110,7 +110,7 @@ static struct platform_driver sdhci_dove_driver = {
> .of_match_table = sdhci_dove_of_match_table,
> },
> .probe = sdhci_dove_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
>
> module_platform_driver(sdhci_dove_driver);
> diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
> index 86eb0045515e..0dbebcecd8fc 100644
> --- a/drivers/mmc/host/sdhci-iproc.c
> +++ b/drivers/mmc/host/sdhci-iproc.c
> @@ -432,7 +432,7 @@ static struct platform_driver sdhci_iproc_driver = {
> .pm = &sdhci_pltfm_pmops,
> },
> .probe = sdhci_iproc_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> .shutdown = sdhci_iproc_shutdown,
> };
> module_platform_driver(sdhci_iproc_driver);
> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
> index 48ca1cf15b19..5072b59f6165 100644
> --- a/drivers/mmc/host/sdhci-of-esdhc.c
> +++ b/drivers/mmc/host/sdhci-of-esdhc.c
> @@ -1521,7 +1521,7 @@ static struct platform_driver sdhci_esdhc_driver = {
> .pm = &esdhc_of_dev_pm_ops,
> },
> .probe = sdhci_esdhc_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
>
> module_platform_driver(sdhci_esdhc_driver);
> diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c
> index 12675797b296..cba3ba48e9dc 100644
> --- a/drivers/mmc/host/sdhci-of-hlwd.c
> +++ b/drivers/mmc/host/sdhci-of-hlwd.c
> @@ -85,7 +85,7 @@ static struct platform_driver sdhci_hlwd_driver = {
> .pm = &sdhci_pltfm_pmops,
> },
> .probe = sdhci_hlwd_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
>
> module_platform_driver(sdhci_hlwd_driver);
> diff --git a/drivers/mmc/host/sdhci-of-sparx5.c b/drivers/mmc/host/sdhci-of-sparx5.c
> index 28e4ee69e100..26aaab068e00 100644
> --- a/drivers/mmc/host/sdhci-of-sparx5.c
> +++ b/drivers/mmc/host/sdhci-of-sparx5.c
> @@ -260,7 +260,7 @@ static struct platform_driver sdhci_sparx5_driver = {
> .pm = &sdhci_pltfm_pmops,
> },
> .probe = sdhci_sparx5_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
>
> module_platform_driver(sdhci_sparx5_driver);
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index 673e750a8490..72d07b49b0a3 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -187,7 +187,7 @@ int sdhci_pltfm_register(struct platform_device *pdev,
> }
> EXPORT_SYMBOL_GPL(sdhci_pltfm_register);
>
> -int sdhci_pltfm_unregister(struct platform_device *pdev)
> +void sdhci_pltfm_unregister(struct platform_device *pdev)
> {
> struct sdhci_host *host = platform_get_drvdata(pdev);
> struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> @@ -196,8 +196,6 @@ int sdhci_pltfm_unregister(struct platform_device *pdev)
> sdhci_remove_host(host, dead);
> clk_disable_unprepare(pltfm_host->clk);
> sdhci_pltfm_free(pdev);
> -
> - return 0;
> }
> EXPORT_SYMBOL_GPL(sdhci_pltfm_unregister);
>
> diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
> index 9bd717ff784b..6e6a443dafd9 100644
> --- a/drivers/mmc/host/sdhci-pltfm.h
> +++ b/drivers/mmc/host/sdhci-pltfm.h
> @@ -102,7 +102,7 @@ extern void sdhci_pltfm_free(struct platform_device *pdev);
> extern int sdhci_pltfm_register(struct platform_device *pdev,
> const struct sdhci_pltfm_data *pdata,
> size_t priv_size);
> -extern int sdhci_pltfm_unregister(struct platform_device *pdev);
> +extern void sdhci_pltfm_unregister(struct platform_device *pdev);
>
> extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host);
>
> diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
> index 91aca8f8d6ef..1c1e763ce209 100644
> --- a/drivers/mmc/host/sdhci-pxav2.c
> +++ b/drivers/mmc/host/sdhci-pxav2.c
> @@ -359,7 +359,7 @@ static struct platform_driver sdhci_pxav2_driver = {
> .pm = &sdhci_pltfm_pmops,
> },
> .probe = sdhci_pxav2_probe,
> - .remove = sdhci_pltfm_unregister,
> + .remove_new = sdhci_pltfm_unregister,
> };
>
> module_platform_driver(sdhci_pxav2_driver);
