Skip to content

Commit 55c421b

Browse files
Uwe Kleine-KönigUlf Hansson
authored andcommitted
mmc: davinci: Don't strip remove function when driver is builtin
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: b4cff45 ("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>
1 parent 53ab7f7 commit 55c421b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/mmc/host/davinci_mmc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev)
13371337
return ret;
13381338
}
13391339

1340-
static void __exit davinci_mmcsd_remove(struct platform_device *pdev)
1340+
static void davinci_mmcsd_remove(struct platform_device *pdev)
13411341
{
13421342
struct mmc_davinci_host *host = platform_get_drvdata(pdev);
13431343

@@ -1392,7 +1392,7 @@ static struct platform_driver davinci_mmcsd_driver = {
13921392
.of_match_table = davinci_mmc_dt_ids,
13931393
},
13941394
.probe = davinci_mmcsd_probe,
1395-
.remove_new = __exit_p(davinci_mmcsd_remove),
1395+
.remove_new = davinci_mmcsd_remove,
13961396
.id_table = davinci_mmc_devtype,
13971397
};
13981398

0 commit comments

Comments
 (0)