svga: Make svga_set_default_atc_regs take an iomem regbase pointer.

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

diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index e09694f58c2c70cd7ace820e2ee9baba27888bef..1028e329c46b862b895ebfb62e06ae7603883a88 100644 (file)
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -654,7 +654,7 @@ static int arkfb_set_par(struct fb_info *info)
 
        /* Set default values */
        svga_set_default_gfx_regs(par->state.vgabase);
-       svga_set_default_atc_regs();
+       svga_set_default_atc_regs(par->state.vgabase);
        svga_set_default_seq_regs();
        svga_set_default_crt_regs();
        svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF);

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 7e34e5a163c4b599d633f76f83a817ccaee5a3f9..7073cf904ccdc080a86477f0032e95478233268c 100644 (file)
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -515,7 +515,7 @@ static int s3fb_set_par(struct fb_info *info)
 
        /* Set default values */
        svga_set_default_gfx_regs(par->state.vgabase);
-       svga_set_default_atc_regs();
+       svga_set_default_atc_regs(par->state.vgabase);
        svga_set_default_seq_regs();
        svga_set_default_crt_regs();
        svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF);

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 25f9f87f73dd8ec0650386bac4363e9c2d9f6935..8b97359db502b16f4736e9ced3c8141f6fa3e5f1 100644 (file)
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -93,26 +93,26 @@ void svga_set_default_gfx_regs(void __iomem *regbase)
 }
 
 /* Set attribute controller registers to sane values */
-void svga_set_default_atc_regs(void)
+void svga_set_default_atc_regs(void __iomem *regbase)
 {
        u8 count;
 
-       vga_r(NULL, 0x3DA);
-       vga_w(NULL, VGA_ATT_W, 0x00);
+       vga_r(regbase, 0x3DA);
+       vga_w(regbase, VGA_ATT_W, 0x00);
 
        /* All standard ATC registers (AR00 - AR14) */
        for (count = 0; count <= 0xF; count ++)
-               svga_wattr(NULL, count, count);
+               svga_wattr(regbase, count, count);
 
-       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);
+       svga_wattr(regbase, VGA_ATC_MODE, 0x01);
+/*     svga_wattr(regbase, VGA_ATC_MODE, 0x41); */
+       svga_wattr(regbase, VGA_ATC_OVERSCAN, 0x00);
+       svga_wattr(regbase, VGA_ATC_PLANE_ENABLE, 0x0F);
+       svga_wattr(regbase, VGA_ATC_PEL, 0x00);
+       svga_wattr(regbase, VGA_ATC_COLOR_PAGE, 0x00);
 
-       vga_r(NULL, 0x3DA);
-       vga_w(NULL, VGA_ATT_W, 0x20);
+       vga_r(regbase, 0x3DA);
+       vga_w(regbase, VGA_ATT_W, 0x20);
 }
 
 /* Set sequencer registers to sane values */

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index ccb4a3e78fda349cc7f56ed6d6d887e58dc83459..310af2dc43cd71b1f589c41423c62d978efd8d7b 100644 (file)
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -426,7 +426,7 @@ static int vt8623fb_set_par(struct fb_info *info)
 
        /* Set default values */
        svga_set_default_gfx_regs(par->state.vgabase);
-       svga_set_default_atc_regs();
+       svga_set_default_atc_regs(par->state.vgabase);
        svga_set_default_seq_regs();
        svga_set_default_crt_regs();
        svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF);

diff --git a/include/linux/svga.h b/include/linux/svga.h
index 4591032247f207b93446f5baaa74487ca9c91d6d..87a41641caeba11f302d106d16229a617376f7a3 100644 (file)
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -100,7 +100,7 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32
 void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
 
 void svga_set_default_gfx_regs(void __iomem *regbase);
-void svga_set_default_atc_regs(void);
+void svga_set_default_atc_regs(void __iomem *regbase);
 void svga_set_default_seq_regs(void);
 void svga_set_default_crt_regs(void);
 void svga_set_textmode_vga_regs(void);