fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c
index 7add7b8..1488bb9 100644 (file)
--- a/drivers/mtd/maps/ebony.c
+++ b/drivers/mtd/maps/ebony.c
@@ -1,11 +1,11 @@
 /*
- * $Id: ebony.c,v 1.10 2004/07/12 21:59:44 dwmw2 Exp $
- * 
+ * $Id: ebony.c,v 1.16 2005/11/07 11:14:26 gleixner Exp $
+ *
  * Mapping for Ebony user flash
  *
- * Matt Porter <mporter@mvista.com>
+ * Matt Porter <mporter@kernel.crashing.org>
  *
- * Copyright 2002 MontaVista Software Inc.
+ * Copyright 2002-2004 MontaVista Software Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -20,10 +20,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/config.h>
 #include <asm/io.h>
 #include <asm/ibm44x.h>
-#include <platforms/ebony.h>
+#include <platforms/4xx/ebony.h>
 
 static struct mtd_info *flash;
 
@@ -63,7 +62,7 @@ static struct mtd_partition ebony_large_partitions[] = {
 int __init init_ebony(void)
 {
        u8 fpga0_reg;
-       unsigned long fpga0_adr;
+       u8 __iomem *fpga0_adr;
        unsigned long long small_flash_base, large_flash_base;
 
        fpga0_adr = ioremap64(EBONY_FPGA_ADDR, 16);
@@ -84,7 +83,7 @@ int __init init_ebony(void)
                small_flash_base = EBONY_SMALL_FLASH_LOW2;
        else
                small_flash_base = EBONY_SMALL_FLASH_LOW1;
-                       
+
        if (EBONY_BOOT_SMALL_FLASH(fpga0_reg) &&
                        !EBONY_ONBRD_FLASH_EN(fpga0_reg))
                large_flash_base = EBONY_LARGE_FLASH_LOW;
@@ -92,8 +91,7 @@ int __init init_ebony(void)
                large_flash_base = EBONY_LARGE_FLASH_HIGH;
 
        ebony_small_map.phys = small_flash_base;
-       ebony_small_map.virt =
-               (unsigned long)ioremap64(small_flash_base,
+       ebony_small_map.virt = ioremap64(small_flash_base,
                                         ebony_small_map.size);
 
        if (!ebony_small_map.virt) {
@@ -103,35 +101,38 @@ int __init init_ebony(void)
 
        simple_map_init(&ebony_small_map);
 
-       flash = do_map_probe("map_rom", &ebony_small_map);
+       flash = do_map_probe("jedec_probe", &ebony_small_map);
        if (flash) {
                flash->owner = THIS_MODULE;
                add_mtd_partitions(flash, ebony_small_partitions,
                                        ARRAY_SIZE(ebony_small_partitions));
        } else {
                printk("map probe failed for flash\n");
+               iounmap(ebony_small_map.virt);
                return -ENXIO;
        }
 
        ebony_large_map.phys = large_flash_base;
-       ebony_large_map.virt =
-               (unsigned long)ioremap64(large_flash_base,
+       ebony_large_map.virt = ioremap64(large_flash_base,
                                         ebony_large_map.size);
 
        if (!ebony_large_map.virt) {
                printk("Failed to ioremap flash\n");
+               iounmap(ebony_small_map.virt);
                return -EIO;
        }
 
        simple_map_init(&ebony_large_map);
 
-       flash = do_map_probe("cfi_probe", &ebony_large_map);
+       flash = do_map_probe("jedec_probe", &ebony_large_map);
        if (flash) {
                flash->owner = THIS_MODULE;
                add_mtd_partitions(flash, ebony_large_partitions,
                                        ARRAY_SIZE(ebony_large_partitions));
        } else {
                printk("map probe failed for flash\n");
+               iounmap(ebony_small_map.virt);
+               iounmap(ebony_large_map.virt);
                return -ENXIO;
        }
 
@@ -146,13 +147,13 @@ static void __exit cleanup_ebony(void)
        }
 
        if (ebony_small_map.virt) {
-               iounmap((void *)ebony_small_map.virt);
-               ebony_small_map.virt = 0;
+               iounmap(ebony_small_map.virt);
+               ebony_small_map.virt = NULL;
        }
 
        if (ebony_large_map.virt) {
-               iounmap((void *)ebony_large_map.virt);
-               ebony_large_map.virt = 0;
+               iounmap(ebony_large_map.virt);
+               ebony_large_map.virt = NULL;
        }
 }
 
@@ -160,5 +161,5 @@ module_init(init_ebony);
 module_exit(cleanup_ebony);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Matt Porter <mporter@mvista.com>");
+MODULE_AUTHOR("Matt Porter <mporter@kernel.crashing.org>");
 MODULE_DESCRIPTION("MTD map and partitions for IBM 440GP Ebony boards");