OMAP: DSS2: move enable/get_te()

Move enable/get_te() from omap_dss_device to omap_dss_driver.

This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.

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

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 6deabb94fd31..cb2e3432618d 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -732,12 +732,13 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                         break;
                 }
 
-                if (!display->enable_te) {
+                if (!display->driver->enable_te) {
                         r = -ENODEV;
                         break;
                 }
 
-                r = display->enable_te(display, !!p.tearsync_info.enabled);
+                r = display->driver->enable_te(display,
+                                !!p.tearsync_info.enabled);
 
                 break;
         }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 216ed80293b8..b0adfb5915c8 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2206,14 +2206,14 @@ static int omapfb_probe(struct platform_device *pdev)
                 /* set the update mode */
                 if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
 #ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
-                        if (def_display->enable_te)
-                                def_display->enable_te(def_display, 1);
+                        if (def_display->driver->enable_te)
+                                def_display->driver->enable_te(def_display, 1);
                         if (def_display->set_update_mode)
                                 def_display->set_update_mode(def_display,
                                                 OMAP_DSS_UPDATE_AUTO);
 #else /* MANUAL_UPDATE */
-                        if (def_display->enable_te)
-                                def_display->enable_te(def_display, 0);
+                        if (def_display->driver->enable_te)
+                                def_display->driver->enable_te(def_display, 0);
                         if (def_display->set_update_mode)
                                 def_display->set_update_mode(def_display,
                                                 OMAP_DSS_UPDATE_MANUAL);