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>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index fdb45674e2f6..59c99fd4901b 100644
--- 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);