Merge branch 'linus' into core/rcu

[mv-sheeva.git] / drivers / video / omap / lcdc.c

diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 43ab7d8b66b2bf9e32d2e687747a8e6427daa6d5..7767338f8b14028fe4ff409eed4717e99296f0ba 100644 (file)
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -572,22 +572,12 @@ static enum omapfb_update_mode omap_lcdc_get_update_mode(void)
 /* PM code called only in internal controller mode */
 static void omap_lcdc_suspend(void)
 {
-       if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) {
-               disable_controller();
-               omap_stop_lcd_dma();
-       }
+       omap_lcdc_set_update_mode(OMAPFB_UPDATE_DISABLED);
 }
 
 static void omap_lcdc_resume(void)
 {
-       if (lcdc.update_mode == OMAPFB_AUTO_UPDATE) {
-               setup_regs();
-               load_palette();
-               setup_lcd_dma();
-               set_load_mode(OMAP_LCDC_LOAD_FRAME);
-               enable_irqs(OMAP_LCDC_IRQ_DONE);
-               enable_controller();
-       }
+       omap_lcdc_set_update_mode(OMAPFB_AUTO_UPDATE);
 }
 
 static void omap_lcdc_get_caps(int plane, struct omapfb_caps *caps)