vserver 1.9.5.x5

[linux-2.6.git] / drivers / mtd / maps / l440gx.c

diff --git a/drivers/mtd/maps/l440gx.c b/drivers/mtd/maps/l440gx.c
index 046f7ef..b086682 100644 (file)
--- a/drivers/mtd/maps/l440gx.c
+++ b/drivers/mtd/maps/l440gx.c
@@ -1,5 +1,5 @@
 /*
- * $Id: l440gx.c,v 1.13 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: l440gx.c,v 1.17 2004/11/28 09:40:39 dwmw2 Exp $
  *
  * BIOS Flash chip on Intel 440GX board.
  *
@@ -30,7 +30,7 @@ static struct mtd_info *mymtd;
 
 
 /* Is this really the vpp port? */
-void l440gx_set_vpp(struct map_info *map, int vpp)
+static void l440gx_set_vpp(struct map_info *map, int vpp)
 {
        unsigned long l;
 
@@ -43,7 +43,7 @@ void l440gx_set_vpp(struct map_info *map, int vpp)
        outl(l, VPP_PORT);
 }
 
-struct map_info l440gx_map = {
+static struct map_info l440gx_map = {
        .name = "L440GX BIOS",
        .size = WINDOW_SIZE,
        .bankwidth = BUSWIDTH,
@@ -73,7 +73,7 @@ static int __init init_l440gx(void)
                return -ENODEV;
        }
 
-       l440gx_map.virt = (unsigned long)ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
+       l440gx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
 
        if (!l440gx_map.virt) {
                printk(KERN_WARNING "Failed to ioremap L440GX flash region\n");
@@ -103,7 +103,7 @@ static int __init init_l440gx(void)
                /* Allocate the resource region */
                if (pci_assign_resource(pm_dev, PIIXE_IOBASE_RESOURCE) != 0) {
                        printk(KERN_WARNING "Could not allocate pm iobase resource\n");
-                       iounmap((void *)l440gx_map.virt);
+                       iounmap(l440gx_map.virt);
                        return -ENXIO;
                }
        }
@@ -137,7 +137,7 @@ static int __init init_l440gx(void)
                return 0;
        }
 
-       iounmap((void *)l440gx_map.virt);
+       iounmap(l440gx_map.virt);
        return -ENXIO;
 }
 
@@ -146,7 +146,7 @@ static void __exit cleanup_l440gx(void)
        del_mtd_device(mymtd);
        map_destroy(mymtd);
        
-       iounmap((void *)l440gx_map.virt);
+       iounmap(l440gx_map.virt);
 }
 
 module_init(init_l440gx);