svga: Make svga_wattr take an iomem regbase pointer.

And use vga_{r,w}().

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 75738a92861000a75b87c7694d9980a241b9ca10..bcbf098a41c70023b8fad2ca6500d807ff3e4950 100644 (file)
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -552,7 +552,7 @@ static int s3fb_set_par(struct fb_info *info)
        }
 
        vga_wcrt(NULL, 0x3A, 0x35);
-       svga_wattr(0x33, 0x00);
+       svga_wattr(par->state.vgabase, 0x33, 0x00);
 
        if (info->var.vmode & FB_VMODE_DOUBLE)
                svga_wcrt_mask(0x09, 0x80, 0x80);

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index fdb45674e2f628b906e3997cf22eebe7c38f6711..59c99fd4901ba3b068b996f0378dc1c2d27e777a 100644 (file)
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -102,14 +102,14 @@ void svga_set_default_atc_regs(void)
 
        /* All standard ATC registers (AR00 - AR14) */
        for (count = 0; count <= 0xF; count ++)
-               svga_wattr(count, count);
+               svga_wattr(NULL, count, count);
 
-       svga_wattr(VGA_ATC_MODE, 0x01);
-/*     svga_wattr(VGA_ATC_MODE, 0x41); */
-       svga_wattr(VGA_ATC_OVERSCAN, 0x00);
-       svga_wattr(VGA_ATC_PLANE_ENABLE, 0x0F);
-       svga_wattr(VGA_ATC_PEL, 0x00);
-       svga_wattr(VGA_ATC_COLOR_PAGE, 0x00);
+       svga_wattr(NULL, VGA_ATC_MODE, 0x01);
+/*     svga_wattr(NULL, VGA_ATC_MODE, 0x41); */
+       svga_wattr(NULL, VGA_ATC_OVERSCAN, 0x00);
+       svga_wattr(NULL, VGA_ATC_PLANE_ENABLE, 0x0F);
+       svga_wattr(NULL, VGA_ATC_PEL, 0x00);
+       svga_wattr(NULL, VGA_ATC_COLOR_PAGE, 0x00);
 
        vga_r(NULL, 0x3DA);
        vga_w(NULL, VGA_ATT_W, 0x20);
@@ -159,8 +159,8 @@ void svga_set_textmode_vga_regs(void)
        vga_r(NULL, 0x3DA);
        vga_w(NULL, VGA_ATT_W, 0x00);
 
-       svga_wattr(0x10, 0x0C);                 /* Attribute Mode Control Register - text mode, blinking and line graphics */
-       svga_wattr(0x13, 0x08);                 /* Horizontal Pixel Panning Register  */
+       svga_wattr(NULL, 0x10, 0x0C);                   /* Attribute Mode Control Register - text mode, blinking and line graphics */
+       svga_wattr(NULL, 0x13, 0x08);                   /* Horizontal Pixel Panning Register  */
 
        vga_r(NULL, 0x3DA);
        vga_w(NULL, VGA_ATT_W, 0x20);

diff --git a/include/linux/svga.h b/include/linux/svga.h
index 3fc52cb0bcb4442facf14b2938d333a876fcb307..95d39412a3c20744d82756d0261a9e8c399bd312 100644 (file)
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -67,11 +67,11 @@ struct svga_pll {
 
 /* Write a value to the attribute register */
 
-static inline void svga_wattr(u8 index, u8 data)
+static inline void svga_wattr(void __iomem *regbase, u8 index, u8 data)
 {
-       inb(VGA_IS1_RC);
-       outb(index, VGA_ATT_IW);
-       outb(data, VGA_ATT_W);
+       vga_r(regbase, VGA_IS1_RC);
+       vga_w(regbase, VGA_ATT_IW, index);
+       vga_w(regbase, VGA_ATT_W, data);
 }
 
 /* Write a value to a sequence register with a mask */