Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c
index acc3af9..50b1403 100644 (file)
--- a/drivers/mtd/maps/redwood.c
+++ b/drivers/mtd/maps/redwood.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redwood.c,v 1.8 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: redwood.c,v 1.11 2005/11/07 11:14:28 gleixner Exp $
  *
  * drivers/mtd/maps/redwood.c
  *
@@ -79,7 +79,7 @@ static struct mtd_partition redwood_flash_partitions[] = {
 
 #define RW_PART0_OF    0
 #define RW_PART0_SZ    0x400000        /* 4 MiB data */
-#define RW_PART1_OF    RW_PART0_OF + RW_PART0_SZ 
+#define RW_PART1_OF    RW_PART0_OF + RW_PART0_SZ
 #define RW_PART1_SZ    0x10000         /* 64K VPD */
 #define RW_PART2_OF    RW_PART1_OF + RW_PART1_SZ
 #define RW_PART2_SZ    0x400000 - (0x10000 + 0x20000)
@@ -121,8 +121,7 @@ struct map_info redwood_flash_map = {
 };
 
 
-#define NUM_REDWOOD_FLASH_PARTITIONS \
-       (sizeof(redwood_flash_partitions)/sizeof(redwood_flash_partitions[0]))
+#define NUM_REDWOOD_FLASH_PARTITIONS ARRAY_SIZE(redwood_flash_partitions)
 
 static struct mtd_info *redwood_mtd;
 
@@ -131,8 +130,7 @@ int __init init_redwood_flash(void)
        printk(KERN_NOTICE "redwood: flash mapping: %x at %x\n",
                        WINDOW_SIZE, WINDOW_ADDR);
 
-       redwood_flash_map.virt =
-               (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+       redwood_flash_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
        if (!redwood_flash_map.virt) {
                printk("init_redwood_flash: failed to ioremap\n");