commit f51a14dded14457e45b1f026a6af5ca6a51e4502
author David Miller <davem@davemloft.net> Tue Jan 11 23:50:36 2011 +0000
committer Paul Mundt <lethal@linux-sh.org> Tue Mar 22 15:46:56 2011 +0900
tree b381cd69fcd34cd0ef7d71baf2e2bc96ff00bbc7
parent e2fade2c146ec718796049104b45267ddbfdf7a1

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>

drivers/video/arkfb.c

diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index e09694f..1028e32 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -654,7 +654,7 @@
 
 	/* 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);

drivers/video/s3fb.c

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 7e34e5a..7073cf9 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -515,7 +515,7 @@
 
 	/* 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);

drivers/video/svgalib.c

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 25f9f87..8b97359 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -93,26 +93,26 @@
 }
 
 /* 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 */

drivers/video/vt8623fb.c

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index ccb4a3e..310af2d 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -426,7 +426,7 @@
 
 	/* 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);

include/linux/svga.h

diff --git a/include/linux/svga.h b/include/linux/svga.h
index 4591032..87a4164 100644
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -100,7 +100,7 @@
 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);