OMAPDSS: use omapdss_compat_init() in other drivers

omapdss_compat_init() and omapdss_compat_uninit() is called internally
by omapdss. This patch moves the calls to omapfb, omap_vout and omapdrm
drivers. omapdrm driver can later remove the call after non-compat
support has been implemented in omapdrm.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 50817fe18cf..f8779d4750b 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -232,8 +232,6 @@ static int __init omap_dss_probe(struct platform_device *pdev)
 
         dss_features_init(omapdss_get_version());
 
-        omapdss_compat_init();
-
         r = dss_initialize_debugfs();
         if (r)
                 goto err_debugfs;
@@ -258,8 +256,6 @@ static int omap_dss_remove(struct platform_device *pdev)
 
         dss_uninitialize_debugfs();
 
-        omapdss_compat_uninit();
-
         return 0;
 }
 
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 1f60741a788..4fa9487a872 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2425,6 +2425,9 @@ static int __init omapfb_probe(struct platform_device *pdev)
                                 "ignoring the module parameter vrfb=y\n");
         }
 
+        r = omapdss_compat_init();
+        if (r)
+                goto err0;
 
         mutex_init(&fbdev->mtx);
 
@@ -2544,6 +2547,7 @@ static int __init omapfb_probe(struct platform_device *pdev)
 
 cleanup:
         omapfb_free_resources(fbdev);
+        omapdss_compat_uninit();
 err0:
         dev_err(&pdev->dev, "failed to setup omapfb\n");
         return r;
@@ -2559,6 +2563,8 @@ static int __exit omapfb_remove(struct platform_device *pdev)
 
         omapfb_free_resources(fbdev);
 
+        omapdss_compat_uninit();
+
         return 0;
 }