11 files changed, 117 insertions, 140 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 321dbe91dc14..cde6fd8eb390 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -22,6 +22,7 @@
 #include <linux/ioport.h>
 #include <linux/list.h>
+#include <asm/sizes.h>
 #include <asm/hardware/amba.h>
 #include <asm/hardware/clock.h>
diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 3c72c627e65e..1991fdb32dfb 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -73,17 +73,15 @@ static void corgibl_blank(int blank)
 }
 #ifdef CONFIG_PM
-static int corgibl_suspend(struct device *dev, pm_message_t state, u32 level)
+static int corgibl_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN)
+        corgibl_blank(FB_BLANK_POWERDOWN);
-                corgibl_blank(FB_BLANK_POWERDOWN);
        return 0;
 }
-static int corgibl_resume(struct device *dev, u32 level)
+static int corgibl_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON)
+        corgibl_blank(FB_BLANK_UNBLANK);
-                corgibl_blank(FB_BLANK_UNBLANK);
        return 0;
 }
 #else
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index eb83a7874c71..7e731691e2a9 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -110,7 +110,7 @@ config STI_CONSOLE
 config FONTS
        bool "Select compiled-in fonts"
-        depends on FRAMEBUFFER_CONSOLE
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
        help
          Say Y here if you would like to use fonts other than the default
          your frame buffer console usually use.
@@ -123,7 +123,7 @@ config FONTS
 config FONT_8x8
        bool "VGA 8x8 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
@@ -137,7 +137,7 @@ config FONT_8x8
 config FONT_8x16
        bool "VGA 8x16 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || USB_SISUSBVGA_CON
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
@@ -147,7 +147,7 @@ config FONT_8x16
 config FONT_6x11
        bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
        default y if !SPARC32 && !SPARC64 && !FONTS && MAC
        help
          Small console font with Macintosh-style high-half glyphs.  Some Mac
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index d940f605acb6..a7bcd17112c0 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -511,12 +511,12 @@ sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
        struct sti_cooked_font *cooked_font;
        
        if (!fbfont_name || !strlen(fbfont_name))
-            return NULL;
+                return NULL;
        fbfont = find_font(fbfont_name);
        if (!fbfont)
-            fbfont = get_default_font(1024,768);
+                fbfont = get_default_font(1024,768);
        if (!fbfont)
-            return NULL;
+                return NULL;
        DPRINTK((KERN_DEBUG "selected %dx%d fb-font %s\n",
                        fbfont->width, fbfont->height, fbfont->name));
@@ -527,7 +527,7 @@ sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
        nf = kmalloc(size, GFP_KERNEL);
        if (!nf)
-            return NULL;
+                return NULL;
        memset(nf, 0, size);
        nf->first_char = 0;
@@ -546,8 +546,8 @@ sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
        cooked_font = kmalloc(sizeof(*cooked_font), GFP_KERNEL);
        if (!cooked_font) {
-            kfree(nf);
+                kfree(nf);
-            return NULL;
+                return NULL;
        }
        
        cooked_font->raw = nf;
@@ -595,7 +595,7 @@ sti_select_font(struct sti_cooked_rom *rom,
 static void __init 
 sti_dump_rom(struct sti_rom *rom)
 {
-        printk(KERN_INFO "    id %04x-%04x, conforms to spec rev. %d.%02x\n",
+        printk(KERN_INFO "    id %04x-%04x, conforms to spec rev. %d.%02x\n",
                rom->graphics_id[0], 
                rom->graphics_id[1],
                rom->revno[0] >> 4, 
@@ -651,15 +651,16 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width)
        struct sti_cooked_font *font;
        int i = 0;
        
-        for(font = rom->font_start; font; font = font->next_font, i++) {
+        for (font = rom->font_start; font; font = font->next_font, i++) {
-            if((font->raw->width == width) && (font->raw->height == height))
+                if ((font->raw->width == width) &&
+                    (font->raw->height == height))
                        return i;
        }
        return 0;
 }
-#define BMODE_RELOCATE(offset)        offset = (offset) / 4;
+#define BMODE_RELOCATE(offset)          offset = (offset) / 4;
-#define BMODE_LAST_ADDR_OFFS          0x50
+#define BMODE_LAST_ADDR_OFFS            0x50
 static void * __init
 sti_bmode_font_raw(struct sti_cooked_font *f)
@@ -700,35 +701,35 @@ sti_get_bmode_rom (unsigned long address)
 {
        struct sti_rom *raw;
        u32 size;
-        struct sti_rom_font *raw_font, *font_start;
+        struct sti_rom_font *raw_font, *font_start;
-    
        sti_bmode_rom_copy(address + BMODE_LAST_ADDR_OFFS, sizeof(size), &size);
-    
-        size = (size+3) / 4;
+        size = (size+3) / 4;
        raw = kmalloc(size, GFP_KERNEL);
        if (raw) {
-            sti_bmode_rom_copy(address, size, raw);
+                sti_bmode_rom_copy(address, size, raw);
-            memmove (&raw->res004, &raw->type[0], 0x3c);
+                memmove (&raw->res004, &raw->type[0], 0x3c);
-            raw->type[3] = raw->res004;
+                raw->type[3] = raw->res004;
-            BMODE_RELOCATE (raw->region_list);
+                BMODE_RELOCATE (raw->region_list);
-            BMODE_RELOCATE (raw->font_start);
+                BMODE_RELOCATE (raw->font_start);
-            BMODE_RELOCATE (raw->init_graph);
+                BMODE_RELOCATE (raw->init_graph);
-            BMODE_RELOCATE (raw->state_mgmt);
+                BMODE_RELOCATE (raw->state_mgmt);
-            BMODE_RELOCATE (raw->font_unpmv);
+                BMODE_RELOCATE (raw->font_unpmv);
-            BMODE_RELOCATE (raw->block_move);
+                BMODE_RELOCATE (raw->block_move);
-            BMODE_RELOCATE (raw->inq_conf);
+                BMODE_RELOCATE (raw->inq_conf);
-            raw_font = ((void *)raw) + raw->font_start;
+                raw_font = ((void *)raw) + raw->font_start;
-            font_start = raw_font;
+                font_start = raw_font;
                
-            while (raw_font->next_font) {
+                while (raw_font->next_font) {
-                    BMODE_RELOCATE (raw_font->next_font);
+                        BMODE_RELOCATE (raw_font->next_font);
-                    raw_font = ((void *)font_start) + raw_font->next_font;
+                        raw_font = ((void *)font_start) + raw_font->next_font;
-            }
+                }
        }
-        return raw;
+        return raw;
 }
 struct sti_rom * __init
@@ -736,15 +737,15 @@ sti_get_wmode_rom (unsigned long address)
 {
        struct sti_rom *raw;
        unsigned long size;
-    
        /* read the ROM size directly from the struct in ROM */ 
        size = gsc_readl(address + offsetof(struct sti_rom,last_addr));
        raw = kmalloc(size, GFP_KERNEL);
-        if(raw)
+        if (raw)
-                sti_rom_copy(address, size, raw);
+                sti_rom_copy(address, size, raw);
-        return raw;
+        return raw;
 }
 int __init
@@ -757,14 +758,14 @@ sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
        if (!cooked)
                goto out_err;
-        if (wordmode)
+        if (wordmode)
-                raw = sti_get_wmode_rom (address);
+                raw = sti_get_wmode_rom (address);
-        else
+        else
-                raw = sti_get_bmode_rom (address);
+                raw = sti_get_bmode_rom (address);
+        if (!raw)
+                goto out_err;
-        if (!raw)
-                goto out_err;
-    
        if (!sti_cook_fonts(cooked, raw)) {
                printk(KERN_ERR "No font found for STI at %08lx\n", address);
                goto out_err;
@@ -787,7 +788,7 @@ sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
        sti->font_width = sti->font->raw->width;
        sti->font_height = sti->font->raw->height;
        if (!wordmode)
-                sti->font->raw = sti_bmode_font_raw(sti->font);
+                sti->font->raw = sti_bmode_font_raw(sti->font);
        sti->sti_mem_request = raw->sti_mem_req;
        sti->graphics_id[0] = raw->graphics_id[0];
@@ -811,16 +812,16 @@ sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd
        u32 sig;
        if (num_sti_roms >= MAX_STI_ROMS) {
-            printk(KERN_WARNING "maximum number of STI ROMS reached !\n");
+                printk(KERN_WARNING "maximum number of STI ROMS reached !\n");
-            return NULL;
+                return NULL;
        }
        
        sti = kmalloc(sizeof(*sti), GFP_KERNEL);
        if (!sti) {
-            printk(KERN_ERR "Not enough memory !\n");
+                printk(KERN_ERR "Not enough memory !\n");
-            return NULL;
+                return NULL;
        }
-                    
        memset(sti, 0, sizeof(*sti));
        spin_lock_init(&sti->lock);
@@ -932,28 +933,21 @@ static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *p
 */
 static int __init sticore_pa_init(struct parisc_device *dev)
 {
-        unsigned long rom = 0;
        char pa_path[21];
        struct sti_struct *sti = NULL;
-        
+        int hpa = dev->hpa.start;
-        if(dev->num_addrs) {
-                rom = dev->addr[0];
+        if (dev->num_addrs && dev->addr[0])
-        }
+                sti = sti_try_rom_generic(dev->addr[0], hpa, NULL);
-        if (!rom) {
+        if (!sti)
-                rom = dev->hpa;
+                sti = sti_try_rom_generic(hpa, hpa, NULL);
-                DPRINTK((KERN_DEBUG "Trying STI ROM at %08lx, hpa at %08lx\n", rom, dev->hpa));
+        if (!sti)
-                sti = sti_try_rom_generic(rom, dev->hpa, NULL);
+                sti = sti_try_rom_generic(PAGE0->proc_sti, hpa, NULL);
-                rom = PAGE0->proc_sti;
-        }
-        if (!sti) {
-                DPRINTK((KERN_DEBUG "Trying STI ROM at %08lx, hpa at %08lx\n", rom, dev->hpa));
-                sti = sti_try_rom_generic(rom, dev->hpa, NULL);
-        }
        if (!sti)
                return 1;
-        
        print_pa_hwpath(dev, pa_path);
-        sticore_check_for_default_sti (sti, pa_path);
+        sticore_check_for_default_sti(sti, pa_path);
        return 0;
 }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 70be7009f8af..9073be4221a8 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1031,7 +1031,7 @@ register_framebuffer(struct fb_info *fb_info)
                        break;
        fb_info->node = i;
-        fb_info->class_device = class_device_create(fb_class, MKDEV(FB_MAJOR, i),
+        fb_info->class_device = class_device_create(fb_class, NULL, MKDEV(FB_MAJOR, i),
                                    fb_info->device, "fb%d", i);
        if (IS_ERR(fb_info->class_device)) {
                /* Not fatal */
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 1d54d3d6960b..0b9301facbd3 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -424,23 +424,21 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
 * Power management hooks.  Note that we won't be called from IRQ context,
 * unlike the blank functions above, so we may sleep.
 */
-static int imxfb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int imxfb_suspend(struct device *dev, pm_message_t state)
 {
        struct imxfb_info *fbi = dev_get_drvdata(dev);
        pr_debug("%s\n",__FUNCTION__);
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
+        imxfb_disable_controller(fbi);
-                imxfb_disable_controller(fbi);
        return 0;
 }
-static int imxfb_resume(struct device *dev, u32 level)
+static int imxfb_resume(struct device *dev)
 {
        struct imxfb_info *fbi = dev_get_drvdata(dev);
        pr_debug("%s\n",__FUNCTION__);
-        if (level == RESUME_ENABLE)
+        imxfb_enable_controller(fbi);
-                imxfb_enable_controller(fbi);
        return 0;
 }
 #else
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 194eed0a238c..6206da9dd5da 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -981,21 +981,19 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
 * Power management hooks.  Note that we won't be called from IRQ context,
 * unlike the blank functions above, so we may sleep.
 */
-static int pxafb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int pxafb_suspend(struct device *dev, pm_message_t state)
 {
        struct pxafb_info *fbi = dev_get_drvdata(dev);
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
+        set_ctrlr_state(fbi, C_DISABLE_PM);
-                set_ctrlr_state(fbi, C_DISABLE_PM);
        return 0;
 }
-static int pxafb_resume(struct device *dev, u32 level)
+static int pxafb_resume(struct device *dev)
 {
        struct pxafb_info *fbi = dev_get_drvdata(dev);
-        if (level == RESUME_ENABLE)
+        set_ctrlr_state(fbi, C_ENABLE_PM);
-                set_ctrlr_state(fbi, C_ENABLE_PM);
        return 0;
 }
 #else
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index fa98d91c42eb..cb2f7a1de947 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -655,7 +655,7 @@ bail:
 }
 #ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
 {
        struct fb_info *info = dev_get_drvdata(dev);
        struct s1d13xxxfb_par *s1dfb = info->par;
@@ -702,15 +702,12 @@ static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level)
                return 0;
 }
-static int s1d13xxxfb_resume(struct device *dev, u32 level)
+static int s1d13xxxfb_resume(struct device *dev)
 {
        struct fb_info *info = dev_get_drvdata(dev);
        struct s1d13xxxfb_par *s1dfb = info->par;
        struct s1d13xxxfb_pdata *pdata = NULL;
-        if (level != RESUME_ENABLE)
-                return 0;
        /* awaken the chip */
        s1d13xxxfb_writereg(s1dfb, S1DREG_PS_CNF, 0x10);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 5ab79afb53b7..3862d3cb1fb2 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -847,37 +847,32 @@ static int s3c2410fb_remove(struct device *dev)
 /* suspend and resume support for the lcd controller */
-static int s3c2410fb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int s3c2410fb_suspend(struct device *dev, pm_message_t state)
 {
        struct fb_info     *fbinfo = dev_get_drvdata(dev);
        struct s3c2410fb_info *info = fbinfo->par;
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN) {
+        s3c2410fb_stop_lcd();
-                s3c2410fb_stop_lcd();
-                /* sleep before disabling the clock, we need to ensure
+        /* sleep before disabling the clock, we need to ensure
-                 * the LCD DMA engine is not going to get back on the bus
+         * the LCD DMA engine is not going to get back on the bus
-                 * before the clock goes off again (bjd) */
+         * before the clock goes off again (bjd) */
-                msleep(1);
+        msleep(1);
-                clk_disable(info->clk);
+        clk_disable(info->clk);
-        }
        return 0;
 }
-static int s3c2410fb_resume(struct device *dev, u32 level)
+static int s3c2410fb_resume(struct device *dev)
 {
        struct fb_info     *fbinfo = dev_get_drvdata(dev);
        struct s3c2410fb_info *info = fbinfo->par;
-        if (level == RESUME_ENABLE) {
+        clk_enable(info->clk);
-                clk_enable(info->clk);
+        msleep(1);
-                msleep(1);
-                s3c2410fb_init_registers(info);
-        }
+        s3c2410fb_init_registers(info);
        return 0;
 }
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 8000890e4271..78e5f194b0df 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1309,21 +1309,19 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
 * Power management hooks.  Note that we won't be called from IRQ context,
 * unlike the blank functions above, so we may sleep.
 */
-static int sa1100fb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int sa1100fb_suspend(struct device *dev, pm_message_t state)
 {
        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
+        set_ctrlr_state(fbi, C_DISABLE_PM);
-                set_ctrlr_state(fbi, C_DISABLE_PM);
        return 0;
 }
-static int sa1100fb_resume(struct device *dev, u32 level)
+static int sa1100fb_resume(struct device *dev)
 {
        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
-        if (level == RESUME_ENABLE)
+        set_ctrlr_state(fbi, C_ENABLE_PM);
-                set_ctrlr_state(fbi, C_ENABLE_PM);
        return 0;
 }
 #else
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 0030c071da8f..752bf88906a9 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -438,36 +438,34 @@ static void w100fb_restore_vidmem(struct w100fb_par *par)
        }
 }
-static int w100fb_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int w100fb_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN) {
+        struct fb_info *info = dev_get_drvdata(dev);
-                struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
-                struct w100fb_par *par=info->par;
+        struct w100_tg_info *tg = par->mach->tg;
-                struct w100_tg_info *tg = par->mach->tg;
+        w100fb_save_vidmem(par);
-                w100fb_save_vidmem(par);
+        if(tg && tg->suspend)
-                if(tg && tg->suspend)
+                tg->suspend(par);
-                        tg->suspend(par);
+        w100_suspend(W100_SUSPEND_ALL);
-                w100_suspend(W100_SUSPEND_ALL);
+        par->blanked = 1;
-                par->blanked = 1;
-        }
        return 0;
 }
-static int w100fb_resume(struct device *dev, uint32_t level)
+static int w100fb_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON) {
+        struct fb_info *info = dev_get_drvdata(dev);
-                struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
-                struct w100fb_par *par=info->par;
+        struct w100_tg_info *tg = par->mach->tg;
-                struct w100_tg_info *tg = par->mach->tg;
+        w100_hw_init(par);
+        w100fb_activate_var(par);
+        w100fb_restore_vidmem(par);
+        if(tg && tg->resume)
+                tg->resume(par);
+        par->blanked = 0;
-                w100_hw_init(par);
-                w100fb_activate_var(par);
-                w100fb_restore_vidmem(par);
-                if(tg && tg->resume)
-                        tg->resume(par);
-                par->blanked = 0;
-        }
        return 0;
 }
 #else