summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 23:49:49 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 15:46:48 +0900
commitdc6aff3a5d3e4f565cb07cd5f3b6983850971da7 (patch)
treed4dc29da69b00a0e24017199715848a63b1a1179 /drivers
parent21da386d0e4c55f6f7482b4637532b942e22b70a (diff)
downloadlinux-3.10-dc6aff3a5d3e4f565cb07cd5f3b6983850971da7.tar.gz
linux-3.10-dc6aff3a5d3e4f565cb07cd5f3b6983850971da7.tar.bz2
linux-3.10-dc6aff3a5d3e4f565cb07cd5f3b6983850971da7.zip
svga: Make svga_wseq_multi take an iomem regbase pointer.
Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/svgalib.c8
-rw-r--r--drivers/video/vt8623fb.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index bf3c7a92eea..ed190aa0965 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -40,12 +40,12 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32
}
/* Write a sequencer register value spread across multiple registers */
-void svga_wseq_multi(const struct vga_regset *regset, u32 value) {
-
+void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value)
+{
u8 regval, bitval, bitnum;
while (regset->regnum != VGA_REGSET_END_VAL) {
- regval = vga_rseq(NULL, regset->regnum);
+ regval = vga_rseq(regbase, regset->regnum);
bitnum = regset->lowbit;
while (bitnum <= regset->highbit) {
bitval = 1 << bitnum;
@@ -54,7 +54,7 @@ void svga_wseq_multi(const struct vga_regset *regset, u32 value) {
bitnum ++;
value = value >> 1;
}
- vga_wseq(NULL, regset->regnum, regval);
+ vga_wseq(regbase, regset->regnum, regval);
regset ++;
}
}
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 46f8e06a55e..f303ea0341b 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -433,7 +433,7 @@ static int vt8623fb_set_par(struct fb_info *info)
svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0);
svga_wcrt_multi(par->state.vgabase, vt8623_offset_regs, offset_value);
- svga_wseq_multi(vt8623_fetch_count_regs, fetch_value);
+ svga_wseq_multi(par->state.vgabase, vt8623_fetch_count_regs, fetch_value);
/* Clear H/V Skew */
svga_wcrt_mask(0x03, 0x00, 0x60);