| Message ID | 20231103173557.3639484-2-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | fbdev: omapfb: Drop unused remove function | expand |
On 11/3/23 18:35, Uwe Kleine-König wrote: > OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a > module. With that __exit_p(vrfb_remove) always evaluates to NULL and > vrfb_remove() is unused. > > If the driver was compilable as a module, it would fail to build because > the type of vrfb_remove() isn't compatible with struct > platform_driver::remove(). (The former returns void, the latter int.) > > Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> applied. Thanks! Helge > --- > drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c > index ee0dd4c6a646..568e6e1eca62 100644 > --- a/drivers/video/fbdev/omap2/omapfb/vrfb.c > +++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c > @@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev) > return 0; > } > > -static void __exit vrfb_remove(struct platform_device *pdev) > -{ > - vrfb_loaded = false; > -} > - > static struct platform_driver vrfb_driver = { > .driver.name = "omapvrfb", > - .remove = __exit_p(vrfb_remove), > }; > - > -module_platform_driver_probe(vrfb_driver, vrfb_probe); > +builtin_platform_driver_probe(vrfb_driver, vrfb_probe); > > MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>"); > MODULE_DESCRIPTION("OMAP VRFB"); > > base-commit: e27090b1413ff236ca1aec26d6b022149115de2c
diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c index ee0dd4c6a646..568e6e1eca62 100644 --- a/drivers/video/fbdev/omap2/omapfb/vrfb.c +++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c @@ -368,17 +368,10 @@ static int __init vrfb_probe(struct platform_device *pdev) return 0; } -static void __exit vrfb_remove(struct platform_device *pdev) -{ - vrfb_loaded = false; -} - static struct platform_driver vrfb_driver = { .driver.name = "omapvrfb", - .remove = __exit_p(vrfb_remove), }; - -module_platform_driver_probe(vrfb_driver, vrfb_probe); +builtin_platform_driver_probe(vrfb_driver, vrfb_probe); MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>"); MODULE_DESCRIPTION("OMAP VRFB");
OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a module. With that __exit_p(vrfb_remove) always evaluates to NULL and vrfb_remove() is unused. If the driver was compilable as a module, it would fail to build because the type of vrfb_remove() isn't compatible with struct platform_driver::remove(). (The former returns void, the latter int.) Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) base-commit: e27090b1413ff236ca1aec26d6b022149115de2c