8 files changed, 78 insertions, 76 deletions

diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 80a81eccad36..832e4613673a 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -115,6 +115,52 @@ static int nocursor = 0;
 module_param(nocursor, int, 0644);
 MODULE_PARM_DESC(nocursor, "cursor enable/disable");
 
+/* fb_blank
+ * Blank the screen. Depending on the mode, the screen will be
+ * activated with the backlight color, or desactivated
+ */
+static int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
+{
+        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
+
+        print_dbg("fb_blank %d %p", blank_mode, fbi);
+
+        switch (blank_mode) {
+
+        case VESA_NO_BLANKING:
+                        /* Turn on panel */
+                        fbdev->regs->lcd_control |= LCD_CONTROL_GO;
+#ifdef CONFIG_MIPS_PB1100
+                        if (drv_info.panel_idx == 1) {
+                                au_writew(au_readw(PB1100_G_CONTROL)
+                                          | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
+                        PB1100_G_CONTROL);
+                        }
+#endif
+                au_sync();
+                break;
+
+        case VESA_VSYNC_SUSPEND:
+        case VESA_HSYNC_SUSPEND:
+        case VESA_POWERDOWN:
+                        /* Turn off panel */
+                        fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
+#ifdef CONFIG_MIPS_PB1100
+                        if (drv_info.panel_idx == 1) {
+                                au_writew(au_readw(PB1100_G_CONTROL)
+                                          & ~(PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
+                        PB1100_G_CONTROL);
+                        }
+#endif
+                au_sync();
+                break;
+        default:
+                break;
+
+        }
+        return 0;
+}
+
 /*
  * Set hardware with var settings. This will enable the controller with a specific
  * mode, normally validated with the fb_check_var method
@@ -272,52 +318,6 @@ int au1100fb_fb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned
         return 0;
 }
 
-/* fb_blank
- * Blank the screen. Depending on the mode, the screen will be
- * activated with the backlight color, or desactivated
- */
-int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
-{
-        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
-
-        print_dbg("fb_blank %d %p", blank_mode, fbi);
-
-        switch (blank_mode) {
-
-        case VESA_NO_BLANKING:
-                        /* Turn on panel */
-                        fbdev->regs->lcd_control |= LCD_CONTROL_GO;
-#ifdef CONFIG_MIPS_PB1100
-                        if (drv_info.panel_idx == 1) {
-                                au_writew(au_readw(PB1100_G_CONTROL)
-                                          | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
-                        PB1100_G_CONTROL);
-                        }
-#endif
-                au_sync();
-                break;
-
-        case VESA_VSYNC_SUSPEND:
-        case VESA_HSYNC_SUSPEND:
-        case VESA_POWERDOWN:
-                        /* Turn off panel */
-                        fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
-#ifdef CONFIG_MIPS_PB1100
-                        if (drv_info.panel_idx == 1) {
-                                au_writew(au_readw(PB1100_G_CONTROL)
-                                          & ~(PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
-                        PB1100_G_CONTROL);
-                        }
-#endif
-                au_sync();
-                break;
-        default:
-                break;
-
-        }
-        return 0;
-}
-
 /* fb_pan_display
  * Pan display in x and/or y as specified
  */
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 718b9f83736e..833b10c84064 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -233,9 +233,9 @@ static u8 bw2regs_66hz[] __devinitdata = {
         0x10, 0x20,     0
 };
 
-static void __devinit bw2_do_default_mode(struct bw2_par *par,
-                                          struct fb_info *info,
-                                          int *linebytes)
+static int __devinit bw2_do_default_mode(struct bw2_par *par,
+                                         struct fb_info *info,
+                                         int *linebytes)
 {
         u8 status, mon;
         u8 *p;
@@ -266,17 +266,18 @@ static void __devinit bw2_do_default_mode(struct bw2_par *par,
                 break;
 
         case BWTWO_SR_ID_NOCONN:
-                return;
+                return 0;
 
         default:
-                prom_printf("bw2: can't handle SR %02x\n",
-                            status);
-                prom_halt();
+                printk(KERN_ERR "bw2: can't handle SR %02x\n",
+                       status);
+                return -EINVAL;
         }
         for ( ; *p; p += 2) {
                 u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
                 sbus_writeb(p[1], regp);
         }
+        return 0;
 }
 
 static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match)
@@ -312,8 +313,11 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
         if (!par->regs)
                 goto out_release_fb;
 
-        if (!of_find_property(dp, "width", NULL))
-                bw2_do_default_mode(par, info, &linebytes);
+        if (!of_find_property(dp, "width", NULL)) {
+                err = bw2_do_default_mode(par, info, &linebytes);
+                if (err)
+                        goto out_unmap_regs;
+        }
 
         par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
 
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 5741b46ade1b..a5c7fb331527 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = {
         4, 0xff,        5, 0x00,        6, 0x70,        7, 0x00,        0
 };
 
-static void __devinit cg3_do_default_mode(struct cg3_par *par)
+static int __devinit cg3_do_default_mode(struct cg3_par *par)
 {
         enum cg3_type type;
         u8 *p;
@@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                         else
                                 type = CG3_AT_66HZ;
                 } else {
-                        prom_printf("cgthree: can't handle SR %02x\n",
-                                    status);
-                        prom_halt();
-                        return;
+                        printk(KERN_ERR "cgthree: can't handle SR %02x\n",
+                               status);
+                        return -EINVAL;
                 }
         }
 
@@ -351,6 +350,7 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                 regp = (u8 __iomem *)&par->regs->cmap.control;
                 sbus_writeb(p[1], regp);
         }
+        return 0;
 }
 
 static int __devinit cg3_probe(struct of_device *op,
@@ -400,8 +400,11 @@ static int __devinit cg3_probe(struct of_device *op,
 
         cg3_blank(0, info);
 
-        if (!of_find_property(dp, "width", NULL))
-                cg3_do_default_mode(par);
+        if (!of_find_property(dp, "width", NULL)) {
+                err = cg3_do_default_mode(par);
+                if (err)
+                        goto out_unmap_screen;
+        }
 
         if (fb_alloc_cmap(&info->cmap, 256, 0))
                 goto out_unmap_screen;
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 49643969f9f8..5db6b1e489b0 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
          oriented.
 
 config STI_CONSOLE
-        tristate "STI text console" 
+        bool "STI text console"
         depends on PARISC
         default y
         help
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 7fa1afeae8dc..dda0586ab3f3 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -738,9 +738,8 @@ const struct consw newport_con = {
 #ifdef MODULE
 static int __init newport_console_init(void)
 {
-
         if (!sgi_gfxaddr)
-                return NULL;
+                return 0;
 
         if (!npregs)
                 npregs = (struct newport_regs *)/* ioremap cannot fail */
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 870017d44970..e9ab657f0bb7 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -232,18 +232,14 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x,
 }
 
 
-/* FIXME: Do we have another solution for this ? */
-static void sti_flush(unsigned long from, unsigned long len)
+static void sti_flush(unsigned long start, unsigned long end)
 {
-        flush_data_cache();
-        flush_kernel_dcache_range(from, len);
-        flush_icache_range(from, from+len);
+        flush_icache_range(start, end);
 }
 
 void __devinit
 sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-        unsigned long dest_len = count;
         unsigned long dest_start = (unsigned long) dest;
 
         /* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */
@@ -260,7 +256,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
                 dest++;
         }
 
-        sti_flush(dest_start, dest_len);
+        sti_flush(dest_start, (unsigned long)dest);
 }
 
 
@@ -663,7 +659,6 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
 static void __devinit
 sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-        unsigned long dest_len = count;
         unsigned long dest_start = (unsigned long) dest;
 
         while (count) {
@@ -672,7 +667,8 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
                 base += 4;
                 dest++;
         }
-        sti_flush(dest_start, dest_len);
+
+        sti_flush(dest_start, (unsigned long)dest);
 }
 
 static struct sti_rom * __devinit
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 5715b8ad0ddc..94f4511023d8 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1391,7 +1391,7 @@ init_imstt(struct fb_info *info)
                 }
         }
 
-#if USE_NV_MODES && defined(CONFIG_PPC)
+#if USE_NV_MODES && defined(CONFIG_PPC32)
         {
                 int vmode = init_vmode, cmode = init_cmode;
 
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 81e571d59b50..a280a52f8efe 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -66,7 +66,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state);
 
 #ifdef CONFIG_FB_PXA_PARAMETERS
 #define PXAFB_OPTIONS_SIZE 256
-static char g_options[PXAFB_OPTIONS_SIZE] __initdata = "";
+static char g_options[PXAFB_OPTIONS_SIZE] __devinitdata = "";
 #endif
 
 static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state)