| Message ID | 20240324114017.231936-2-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: davinci: Don't strip remove function when driver is builtin | expand |
On Sun, 24 Mar 2024 at 12:40, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > 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> Applied for next and by adding a stable tag, thanks! Kind regards Uffe > --- > drivers/mmc/host/davinci_mmc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c > index 8bd938919687..d7427894e0bc 100644 > --- a/drivers/mmc/host/davinci_mmc.c > +++ b/drivers/mmc/host/davinci_mmc.c > @@ -1337,7 +1337,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) > 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, > }; > > > base-commit: 70293240c5ce675a67bfc48f419b093023b862b3 > -- > 2.43.0 >
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 8bd938919687..d7427894e0bc 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -1337,7 +1337,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) 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, };
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> --- drivers/mmc/host/davinci_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 70293240c5ce675a67bfc48f419b093023b862b3