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>

diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index bf3c7a92eeab34b11e0d6c69521bd8fae297a91f..ed190aa09653b753c3dc2966f2d714736efd65c8 100644 (file)
--- 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 */
 }
 
 /* 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) {
        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;
                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;
                }
                        bitnum ++;
                        value = value >> 1;
                }

-               vga_wseq(NULL, regset->regnum, regval);
+               vga_wseq(regbase, regset->regnum, regval);

                regset ++;
        }
 }
                regset ++;
        }
 }

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 46f8e06a55e804bd1bfbbdc857a9426858aef69f..f303ea0341bc7b8a170954a33f0ce0472855b347 100644 (file)
--- 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_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);
 
        /* Clear H/V Skew */
        svga_wcrt_mask(0x03, 0x00, 0x60);

diff --git a/include/linux/svga.h b/include/linux/svga.h
index 8ca81e0b0a6c8318ff0724fc067e6e7ace727cf3..357e2bdac9aa9332789eae05a36dbfda3f2b283f 100644 (file)
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -97,7 +97,7 @@ static inline int svga_primary_device(struct pci_dev *dev)
 
 
 void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);
 
 
 void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value);

-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);

 
 void svga_set_default_gfx_regs(void);
 void svga_set_default_atc_regs(void);
 
 void svga_set_default_gfx_regs(void);
 void svga_set_default_atc_regs(void);