summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/omap2/dss/venc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-04 14:12:16 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-17 13:44:47 +0300
commitede9269572da9206249f02ebe031ded025b84fd3 (patch)
tree024b2c3e33732aca92358bafa2ed1dbc25cd096d /drivers/video/fbdev/omap2/dss/venc.c
parentf5a1a1f8e41e93584935d4ae62a84280dcdbe778 (diff)
downloadop-kernel-dev-ede9269572da9206249f02ebe031ded025b84fd3.zip
op-kernel-dev-ede9269572da9206249f02ebe031ded025b84fd3.tar.gz
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/venc.c')
-rw-r--r--drivers/video/fbdev/omap2/dss/venc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/omap2/dss/venc.c b/drivers/video/fbdev/omap2/dss/venc.c
index ef7fd92..e7fad0e 100644
--- a/drivers/video/fbdev/omap2/dss/venc.c
+++ b/drivers/video/fbdev/omap2/dss/venc.c
@@ -802,7 +802,7 @@ static void venc_init_output(struct platform_device *pdev)
omapdss_register_output(out);
}
-static void __exit venc_uninit_output(struct platform_device *pdev)
+static void venc_uninit_output(struct platform_device *pdev)
{
struct omap_dss_device *out = &venc.output;
@@ -912,7 +912,7 @@ err_runtime_get:
return r;
}
-static int __exit omap_venchw_remove(struct platform_device *pdev)
+static int omap_venchw_remove(struct platform_device *pdev)
{
venc_uninit_output(pdev);
@@ -960,7 +960,7 @@ static const struct of_device_id venc_of_match[] = {
static struct platform_driver omap_venchw_driver = {
.probe = omap_venchw_probe,
- .remove = __exit_p(omap_venchw_remove),
+ .remove = omap_venchw_remove,
.driver = {
.name = "omapdss_venc",
.pm = &venc_pm_ops,
@@ -974,7 +974,7 @@ int __init venc_init_platform_driver(void)
return platform_driver_register(&omap_venchw_driver);
}
-void __exit venc_uninit_platform_driver(void)
+void venc_uninit_platform_driver(void)
{
platform_driver_unregister(&omap_venchw_driver);
}
OpenPOWER on IntegriCloud