aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/omapfb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/omapfb')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 3dbbddc2d51e..b327ee0e60d5 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1223,8 +1223,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
1223 if (display->state != OMAP_DSS_DISPLAY_SUSPENDED) 1223 if (display->state != OMAP_DSS_DISPLAY_SUSPENDED)
1224 goto exit; 1224 goto exit;
1225 1225
1226 if (display->resume) 1226 if (display->driver->resume)
1227 r = display->resume(display); 1227 r = display->driver->resume(display);
1228 1228
1229 if (r == 0 && display->driver->get_update_mode && 1229 if (r == 0 && display->driver->get_update_mode &&
1230 display->driver->get_update_mode(display) == 1230 display->driver->get_update_mode(display) ==
@@ -1242,8 +1242,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
1242 if (display->state != OMAP_DSS_DISPLAY_ACTIVE) 1242 if (display->state != OMAP_DSS_DISPLAY_ACTIVE)
1243 goto exit; 1243 goto exit;
1244 1244
1245 if (display->suspend) 1245 if (display->driver->suspend)
1246 r = display->suspend(display); 1246 r = display->driver->suspend(display);
1247 1247
1248 break; 1248 break;
1249 1249
@@ -1831,7 +1831,7 @@ static void omapfb_free_resources(struct omapfb2_device *fbdev)
1831 1831
1832 for (i = 0; i < fbdev->num_displays; i++) { 1832 for (i = 0; i < fbdev->num_displays; i++) {
1833 if (fbdev->displays[i]->state != OMAP_DSS_DISPLAY_DISABLED) 1833 if (fbdev->displays[i]->state != OMAP_DSS_DISPLAY_DISABLED)
1834 fbdev->displays[i]->disable(fbdev->displays[i]); 1834 fbdev->displays[i]->driver->disable(fbdev->displays[i]);
1835 1835
1836 omap_dss_put_device(fbdev->displays[i]); 1836 omap_dss_put_device(fbdev->displays[i]);
1837 } 1837 }
@@ -2197,7 +2197,7 @@ static int omapfb_probe(struct platform_device *pdev)
2197#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE 2197#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
2198 u16 w, h; 2198 u16 w, h;
2199#endif 2199#endif
2200 r = def_display->enable(def_display); 2200 r = def_display->driver->enable(def_display);
2201 if (r) { 2201 if (r) {
2202 dev_warn(fbdev->dev, "Failed to enable display '%s'\n", 2202 dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
2203 def_display->name); 2203 def_display->name);