diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-04 14:12:16 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-17 13:44:47 +0300 |
| commit | ede9269572da9206249f02ebe031ded025b84fd3 (patch) | |
| tree | 024b2c3e33732aca92358bafa2ed1dbc25cd096d /drivers/video/fbdev/omap2/dss/sdi.c | |
| parent | OMAPDSS: fix dss_init_ports error handling (diff) | |
| download | linux-dev-ede9269572da9206249f02ebe031ded025b84fd3.tar.xz linux-dev-ede9269572da9206249f02ebe031ded025b84fd3.zip | |
OMAPDSS: remove uses of __init/__exit
The following patches will add component handling to omapdss, improving
the handling of deferred probing. However, at the moment we're using
quite a lot of __inits and __exits in the driver, which prevent normal
dynamic probing and removal.
This patch removes most of the uses of __init and __exit, so that we can
register drivers after module init, and so that we can unregister
drivers even if the module is built-in.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/sdi.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/sdi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/fbdev/omap2/dss/sdi.c b/drivers/video/fbdev/omap2/dss/sdi.c index 5c2ccab5a958..a873118f1e0e 100644 --- a/drivers/video/fbdev/omap2/dss/sdi.c +++ b/drivers/video/fbdev/omap2/dss/sdi.c @@ -350,7 +350,7 @@ static void sdi_init_output(struct platform_device *pdev) omapdss_register_output(out); } -static void __exit sdi_uninit_output(struct platform_device *pdev) +static void sdi_uninit_output(struct platform_device *pdev) { struct omap_dss_device *out = &sdi.output; @@ -366,7 +366,7 @@ static int omap_sdi_probe(struct platform_device *pdev) return 0; } -static int __exit omap_sdi_remove(struct platform_device *pdev) +static int omap_sdi_remove(struct platform_device *pdev) { sdi_uninit_output(pdev); @@ -375,7 +375,7 @@ static int __exit omap_sdi_remove(struct platform_device *pdev) static struct platform_driver omap_sdi_driver = { .probe = omap_sdi_probe, - .remove = __exit_p(omap_sdi_remove), + .remove = omap_sdi_remove, .driver = { .name = "omapdss_sdi", .suppress_bind_attrs = true, @@ -387,12 +387,12 @@ int __init sdi_init_platform_driver(void) return platform_driver_register(&omap_sdi_driver); } -void __exit sdi_uninit_platform_driver(void) +void sdi_uninit_platform_driver(void) { platform_driver_unregister(&omap_sdi_driver); } -int __init sdi_init_port(struct platform_device *pdev, struct device_node *port) +int sdi_init_port(struct platform_device *pdev, struct device_node *port) { struct device_node *ep; u32 datapairs; @@ -426,7 +426,7 @@ err_datapairs: return r; } -void __exit sdi_uninit_port(struct device_node *port) +void sdi_uninit_port(struct device_node *port) { if (!sdi.port_initialized) return; |