vserver 1.9.5.x5

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

diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index e3e43ca..e2fa9e1 100644 (file)
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -106,10 +106,10 @@ struct bt_regs {
 
 struct tcx_par {
        spinlock_t              lock;
-       struct bt_regs          *bt;
-       struct tcx_thc          *thc;
-       struct tcx_tec          *tec;
-       volatile u32            *cplane;
+       struct bt_regs          __iomem *bt;
+       struct tcx_thc          __iomem *thc;
+       struct tcx_tec          __iomem *tec;
+       volatile u32            __iomem *cplane;
 
        u32                     flags;
 #define TCX_FLAG_BLANKED       0x00000001
@@ -127,7 +127,7 @@ struct tcx_par {
 /* Reset control plane so that WID is 8-bit plane. */
 static void __tcx_set_control_plane (struct tcx_par *par)
 {
-       volatile u32 *p, *pend;
+       volatile u32 __iomem *p, *pend;
         
        if (par->lowdepth)
                return;
@@ -167,7 +167,7 @@ static int tcx_setcolreg(unsigned regno,
                         unsigned transp, struct fb_info *info)
 {
        struct tcx_par *par = (struct tcx_par *) info->par;
-       struct bt_regs *bt = par->bt;
+       struct bt_regs __iomem *bt = par->bt;
        unsigned long flags;
 
        if (regno >= 256)
@@ -198,7 +198,7 @@ static int
 tcx_blank(int blank, struct fb_info *info)
 {
        struct tcx_par *par = (struct tcx_par *) info->par;
-       struct tcx_thc *thc = par->thc;
+       struct tcx_thc __iomem *thc = par->thc;
        unsigned long flags;
        u32 val;
 
@@ -207,26 +207,26 @@ tcx_blank(int blank, struct fb_info *info)
        val = sbus_readl(&thc->thc_misc);
 
        switch (blank) {
-       case 0: /* Unblanking */
+       case FB_BLANK_UNBLANK: /* Unblanking */
                val &= ~(TCX_THC_MISC_VSYNC_DIS |
                         TCX_THC_MISC_HSYNC_DIS);
                val |= TCX_THC_MISC_VIDEO;
                par->flags &= ~TCX_FLAG_BLANKED;
                break;
 
-       case 1: /* Normal blanking */
+       case FB_BLANK_NORMAL: /* Normal blanking */
                val &= ~TCX_THC_MISC_VIDEO;
                par->flags |= TCX_FLAG_BLANKED;
                break;
 
-       case 2: /* VESA blank (vsync off) */
+       case FB_BLANK_VSYNC_SUSPEND: /* VESA blank (vsync off) */
                val |= TCX_THC_MISC_VSYNC_DIS;
                break;
-       case 3: /* VESA blank (hsync off) */
+       case FB_BLANK_HSYNC_SUSPEND: /* VESA blank (hsync off) */
                val |= TCX_THC_MISC_HSYNC_DIS;
                break;
 
-       case 4: /* Poweroff */
+       case FB_BLANK_POWERDOWN: /* Poweroff */
                break;
        };
 
@@ -371,19 +371,15 @@ static void tcx_init_one(struct sbus_dev *sdev)
                                       all->info.var.xres);
        all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-       all->par.tec = (struct tcx_tec *)
-               sbus_ioremap(&sdev->resource[7], 0,
+       all->par.tec = sbus_ioremap(&sdev->resource[7], 0,
                             sizeof(struct tcx_tec), "tcx tec");
-       all->par.thc = (struct tcx_thc *)
-               sbus_ioremap(&sdev->resource[9], 0,
+       all->par.thc = sbus_ioremap(&sdev->resource[9], 0,
                             sizeof(struct tcx_thc), "tcx thc");
-       all->par.bt = (struct bt_regs *)
-               sbus_ioremap(&sdev->resource[8], 0,
+       all->par.bt = sbus_ioremap(&sdev->resource[8], 0,
                             sizeof(struct bt_regs), "tcx dac");
        memcpy(&all->par.mmap_map, &__tcx_mmap_map, sizeof(all->par.mmap_map));
        if (!all->par.lowdepth) {
-               all->par.cplane = (volatile u32 *)
-                       sbus_ioremap(&sdev->resource[4], 0,
+               all->par.cplane = sbus_ioremap(&sdev->resource[4], 0,
                                     all->par.fbsize * sizeof(u32), "tcx cplane");
        } else {
                all->par.mmap_map[1].size = SBUS_MMAP_EMPTY;
@@ -415,14 +411,12 @@ static void tcx_init_one(struct sbus_dev *sdev)
        all->info.flags = FBINFO_DEFAULT;
        all->info.fbops = &tcx_ops;
 #ifdef CONFIG_SPARC32
-       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 *)
-                       sbus_ioremap(&sdev->resource[0], 0,
+               all->info.screen_base = sbus_ioremap(&sdev->resource[0], 0,
                                     all->par.fbsize, "tcx ram");
-       all->info.currcon = -1;
        all->info.par = &all->par;
 
        /* Initialize brooktree DAC. */