OSDN Git Service

mmc: sdhci_am654: Convert to platform remove callback returning void
authorYangtao Li <frank.li@vivo.com>
Thu, 27 Jul 2023 07:00:49 +0000 (15:00 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 15 Aug 2023 10:48:21 +0000 (12:48 +0200)
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@pengutronix.de>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230727070051.17778-60-frank.li@vivo.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci_am654.c

index 1cc8473..c125485 100644 (file)
@@ -866,7 +866,7 @@ err_pltfm_free:
        return ret;
 }
 
-static int sdhci_am654_remove(struct platform_device *pdev)
+static void sdhci_am654_remove(struct platform_device *pdev)
 {
        struct sdhci_host *host = platform_get_drvdata(pdev);
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -882,7 +882,6 @@ static int sdhci_am654_remove(struct platform_device *pdev)
        pm_runtime_disable(dev);
        pm_runtime_put_noidle(dev);
        sdhci_pltfm_free(pdev);
-       return 0;
 }
 
 #ifdef CONFIG_PM
@@ -994,7 +993,7 @@ static struct platform_driver sdhci_am654_driver = {
                .of_match_table = sdhci_am654_of_match,
        },
        .probe = sdhci_am654_probe,
-       .remove = sdhci_am654_remove,
+       .remove_new = sdhci_am654_remove,
 };
 
 module_platform_driver(sdhci_am654_driver);