This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / video / sstfb.c

diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 52686d8..e3ea32b 100644 (file)
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -67,6 +67,10 @@
 
 #undef SST_DEBUG
 
+#define SST_DEBUG_REG   0
+#define SST_DEBUG_FUNC  0
+#define SST_DEBUG_VAR   0
+
 /* enable 24/32 bpp functions ? (completely untested!) */
 #undef EN_24_32_BPP
 
@@ -216,26 +220,26 @@ static void sst_dbg_print_write_reg(u32 reg, u32 val) {
 #define dac_i_read(reg)                __dac_i_read(par->mmio_vbase, reg)
 #define dac_i_write(reg,val)   __dac_i_write(par->mmio_vbase, reg, val)
 
-static inline u32 __sst_read(u8 __iomem *vbase, u32 reg)
+static inline u32 __sst_read(u_long vbase, u32 reg)
 {
        u32 ret = readl(vbase + reg);
        sst_dbg_print_read_reg(reg, ret);
        return ret;
 }
 
-static inline void __sst_write(u8 __iomem *vbase, u32 reg, u32 val)
+static inline void __sst_write(u_long vbase, u32 reg, u32 val)
 {
        sst_dbg_print_write_reg(reg, val);
        writel(val, vbase + reg);
 }
 
-static inline void __sst_set_bits(u8 __iomem *vbase, u32 reg, u32 val)
+static inline void __sst_set_bits(u_long vbase, u32 reg, u32 val)
 {
        r_dprintk("sst_set_bits(%#x, %#x)\n", reg, val);
        __sst_write(vbase, reg, __sst_read(vbase, reg) | val);
 }
 
-static inline void __sst_unset_bits(u8 __iomem *vbase, u32 reg, u32 val)
+static inline void __sst_unset_bits(u_long vbase, u32 reg, u32 val)
 {
        r_dprintk("sst_unset_bits(%#x, %#x)\n", reg, val);
        __sst_write(vbase, reg, __sst_read(vbase, reg) & ~val);
@@ -250,7 +254,7 @@ static inline void __sst_unset_bits(u8 __iomem *vbase, u32 reg, u32 val)
 
 #define sst_wait_idle() __sst_wait_idle(par->mmio_vbase)
 
-static int __sst_wait_idle(u8 __iomem *vbase)
+static int __sst_wait_idle(u_long vbase)
 {
        int count = 0;
 
@@ -275,7 +279,7 @@ static int __sst_wait_idle(u8 __iomem *vbase)
 
 /* dac access */
 /* dac_read should be remaped to FbiInit2 (via the pci reg init_enable) */
-static u8 __sst_dac_read(u8 __iomem *vbase, u8 reg)
+static u8 __sst_dac_read(u_long vbase, u8 reg)
 {
        u8 ret;
 
@@ -289,7 +293,7 @@ static u8 __sst_dac_read(u8 __iomem *vbase, u8 reg)
        return ret;
 }
 
-static void __sst_dac_write(u8 __iomem *vbase, u8 reg, u8 val)
+static void __sst_dac_write(u_long vbase, u8 reg, u8 val)
 {
        r_dprintk("sst_dac_write(%#x, %#x)\n", reg, val);
        reg &= 0x07;
@@ -297,7 +301,7 @@ static void __sst_dac_write(u8 __iomem *vbase, u8 reg, u8 val)
 }
 
 /* indexed access to ti/att dacs */
-static u32 __dac_i_read(u8 __iomem *vbase, u8 reg)
+static u32 __dac_i_read(u_long vbase, u8 reg)
 {
        u32 ret;
 
@@ -306,7 +310,7 @@ static u32 __dac_i_read(u8 __iomem *vbase, u8 reg)
        r_dprintk("sst_dac_read_i(%#x): %#x\n", reg, ret);
        return ret;
 }
-static void __dac_i_write(u8 __iomem *vbase, u8 reg,u8 val)
+static void __dac_i_write(u_long vbase, u8 reg,u8 val)
 {
        r_dprintk("sst_dac_write_i(%#x, %#x)\n", reg, val);
        __sst_dac_write(vbase, DACREG_ADDR_I, reg);
@@ -882,7 +886,7 @@ static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
  */
 static int __devinit sst_get_memsize(struct fb_info *info, __u32 *memsize)
 {
-       u8 __iomem *fbbase_virt = info->screen_base;
+       u_long fbbase_virt = (u_long) info->screen_base;
 
        /* force memsize */
        if ((mem >= 1 ) &&  (mem <= 4)) {
@@ -1438,7 +1442,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
                goto fail_fb_mem;
        }
 
-       par->mmio_vbase = ioremap_nocache(fix->mmio_start,
+       par->mmio_vbase = (u_long) ioremap_nocache(fix->mmio_start,
                                        fix->mmio_len);
        if (!par->mmio_vbase) {
                eprintk("cannot remap register area %#lx\n",
@@ -1471,6 +1475,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
 
        info->flags     = FBINFO_DEFAULT;
        info->fbops     = &sstfb_ops;
+       info->currcon   = -1;
        info->pseudo_palette = &all->pseudo_palette;
 
        fix->type       = FB_TYPE_PACKED_PIXELS;
@@ -1502,7 +1507,6 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
        fb_alloc_cmap(&info->cmap, 256, 0);
 
        /* register fb */
-       info->device = &pdev->dev;
        if (register_framebuffer(info) < 0) {
                eprintk("can't register framebuffer.\n");
                goto fail;
@@ -1521,7 +1525,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
 fail:
        iounmap(info->screen_base);
 fail_fb_remap:
-       iounmap(par->mmio_vbase);
+       iounmap((void *)par->mmio_vbase);
 fail_mmio_remap:
        release_mem_region(fix->smem_start, 0x400000);
 fail_fb_mem:
@@ -1542,7 +1546,7 @@ static void __devexit sstfb_remove(struct pci_dev *pdev)
        sst_shutdown(info);
        unregister_framebuffer(info);
        iounmap(info->screen_base);
-       iounmap(par->mmio_vbase);
+       iounmap((void*)par->mmio_vbase);
        release_mem_region(info->fix.smem_start, 0x400000);
        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
        kfree(info);
@@ -1639,10 +1643,10 @@ static int sstfb_dump_regs(struct fb_info *info)
 
 static void sstfb_fillrect_softw( struct fb_info *info, const struct fb_fillrect *rect)
 {
-       u8 __iomem *fbbase_virt = info->screen_base;
+       unsigned long fbbase_virt = (unsigned long) info->screen_base;
        int x, y, w = info->var.bits_per_pixel == 16 ? 2 : 4;
        u32 color = rect->color, height = rect->height;
-       u8 __iomem *p;
+       unsigned long p;
        
        if (w==2) color |= color<<16;
        for (y=rect->dy; height; y++, height--) {