OMAP: DSS2: move get_resolution()

Move get_resolution() 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 36afab30921e..6deabb94fd31 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -167,7 +167,7 @@ static int omapfb_update_window_nolock(struct fb_info *fbi,
         if (w == 0 || h == 0)
                 return 0;
 
-        display->get_resolution(display, &dw, &dh);
+        display->driver->get_resolution(display, &dw, &dh);
 
         if (x + w > dw || y + h > dh)
                 return -EINVAL;
@@ -752,7 +752,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                         break;
                 }
 
-                display->get_resolution(display, &xres, &yres);
+                display->driver->get_resolution(display, &xres, &yres);
 
                 p.display_info.xres = xres;
                 p.display_info.yres = yres;
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 6a383ab2bef2..212d2efb380c 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1254,7 +1254,7 @@ exit:
 
         if (r == 0 && do_update && display->update) {
                 u16 w, h;
-                display->get_resolution(display, &w, &h);
+                display->driver->get_resolution(display, &w, &h);
 
                 r = display->update(display, 0, 0, w, h);
         }
@@ -1427,7 +1427,7 @@ static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
         if (!size) {
                 u16 w, h;
 
-                display->get_resolution(display, &w, &h);
+                display->driver->get_resolution(display, &w, &h);
 
                 if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
                         size = max(omap_vrfb_min_phys_size(w, h, bytespp),
@@ -1745,7 +1745,7 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
                 u16 w, h;
                 int rotation = (var->rotate + ofbi->rotation[0]) % 4;
 
-                display->get_resolution(display, &w, &h);
+                display->driver->get_resolution(display, &w, &h);
 
                 if (rotation == FB_ROTATE_CW ||
                                 rotation == FB_ROTATE_CCW) {
@@ -2197,7 +2197,8 @@ static int omapfb_probe(struct platform_device *pdev)
                                 def_display->set_update_mode(def_display,
                                                 OMAP_DSS_UPDATE_MANUAL);
 
-                        def_display->get_resolution(def_display, &w, &h);
+                        def_display->driver->get_resolution(def_display,
+                                        &w, &h);
                         def_display->update(def_display, 0, 0, w, h);
 #endif
                 } else {