mmc: davinci: Don't strip remove function when driver is builtin
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 24 Mar 2024 11:40:17 +0000 (12:40 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 2 Apr 2024 10:21:39 +0000 (12:21 +0200)
Using __exit for the remove function results in the remove callback being
discarded with CONFIG_MMC_DAVINCI=y. When such a device gets unbound (e.g.
using sysfs or hotplug), the driver is just removed without the cleanup
being performed. This results in resource leaks. Fix it by compiling in the
remove callback unconditionally.

This also fixes a W=1 modpost warning:

WARNING: modpost: drivers/mmc/host/davinci_mmc: section mismatch in
reference: davinci_mmcsd_driver+0x10 (section: .data) ->
davinci_mmcsd_remove (section: .exit.text)

Fixes: b4cff4549b7a ("DaVinci: MMC: MMC/SD controller driver for DaVinci family")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240324114017.231936-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/davinci_mmc.c

index 8bd938919687b73adc30404ce915d7db7d0964ff..d7427894e0bc9f6bc70e11cc048511c1bc44463d 100644 (file)
@@ -1337,7 +1337,7 @@ ioremap_fail:
        return ret;
 }
 
-static void __exit davinci_mmcsd_remove(struct platform_device *pdev)
+static void davinci_mmcsd_remove(struct platform_device *pdev)
 {
        struct mmc_davinci_host *host = platform_get_drvdata(pdev);
 
@@ -1392,7 +1392,7 @@ static struct platform_driver davinci_mmcsd_driver = {
                .of_match_table = davinci_mmc_dt_ids,
        },
        .probe          = davinci_mmcsd_probe,
-       .remove_new     = __exit_p(davinci_mmcsd_remove),
+       .remove_new     = davinci_mmcsd_remove,
        .id_table       = davinci_mmc_devtype,
 };