vserver 1.9.5.x5

[linux-2.6.git] / drivers / video / bw2.c

diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 65b65ad..3d20b2d 100644 (file)
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -110,7 +110,7 @@ struct bw2_regs {
 
 struct bw2_par {
        spinlock_t              lock;
-       struct bw2_regs         *regs;
+       struct bw2_regs         __iomem *regs;
 
        u32                     flags;
 #define BW2_FLAG_BLANKED       0x00000001
@@ -131,24 +131,24 @@ static int
 bw2_blank(int blank, struct fb_info *info)
 {
        struct bw2_par *par = (struct bw2_par *) info->par;
-       struct bw2_regs *regs = par->regs;
+       struct bw2_regs __iomem *regs = par->regs;
        unsigned long flags;
        u8 val;
 
        spin_lock_irqsave(&par->lock, flags);
 
        switch (blank) {
-       case 0: /* Unblanking */
+       case FB_BLANK_UNBLANK: /* Unblanking */
                val = sbus_readb(&regs->control);
                val |= BWTWO_CTL_ENABLE_VIDEO;
                sbus_writeb(val, &regs->control);
                par->flags &= ~BW2_FLAG_BLANKED;
                break;
 
-       case 1: /* Normal blanking */
-       case 2: /* VESA blank (vsync off) */
-       case 3: /* VESA blank (hsync off) */
-       case 4: /* Poweroff */
+       case FB_BLANK_NORMAL: /* Normal blanking */
+       case FB_BLANK_VSYNC_SUSPEND: /* VESA blank (vsync off) */
+       case FB_BLANK_HSYNC_SUSPEND: /* VESA blank (hsync off) */
+       case FB_BLANK_POWERDOWN: /* Poweroff */
                val = sbus_readb(&regs->control);
                val &= ~BWTWO_CTL_ENABLE_VIDEO;
                sbus_writeb(val, &regs->control);
@@ -281,7 +281,7 @@ static void bw2_do_default_mode(struct bw2_par *par, struct fb_info *info,
                prom_halt();
        }
        for ( ; *p; p += 2) {
-               u8 *regp = &((u8 *)par->regs)[p[0]];
+               u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
                sbus_writeb(p[1], regp);
        }
 }
@@ -342,8 +342,7 @@ static void bw2_init_one(struct sbus_dev *sdev)
        all->info.var.red.offset = all->info.var.green.offset =
                all->info.var.blue.offset = 0;
 
-       all->par.regs = (struct bw2_regs *)
-               sbus_ioremap(resp, BWTWO_REGISTER_OFFSET,
+       all->par.regs = sbus_ioremap(resp, BWTWO_REGISTER_OFFSET,
                             sizeof(struct bw2_regs), "bw2 regs");
 
        if (sdev && !prom_getbool(sdev->prom_node, "width"))
@@ -355,13 +354,12 @@ static void bw2_init_one(struct sbus_dev *sdev)
        all->info.fbops = &bw2_ops;
 #if defined(CONFIG_SPARC32)
        if (sdev)
-               all->info.screen_base = (char *)
+               all->info.screen_base = (char __iomem *)
                        prom_getintdefault(sdev->prom_node, "address", 0);
 #endif
        if (!all->info.screen_base)
-               all->info.screen_base = (char *)
+               all->info.screen_base =
                        sbus_ioremap(resp, 0, all->par.fbsize, "bw2 ram");
-       all->info.currcon = -1;
        all->info.par = &all->par;
 
        bw2_blank(0, &all->info);
@@ -386,7 +384,7 @@ int __init bw2_init(void)
        struct sbus_bus *sbus;
        struct sbus_dev *sdev;
 
-       if (fb_get_options("bw2fb", &option))
+       if (fb_get_options("bw2fb", NULL))
                return -ENODEV;
 
 #ifdef CONFIG_SUN4