mtd/drivers/mtd/maps tqm8xxl.c,1.12,1.13

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv26807

Modified Files:
	tqm8xxl.c 
Log Message:
alternative fix from upstream

Index: tqm8xxl.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/tqm8xxl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tqm8xxl.c	16 Sep 2004 23:27:14 -0000	1.12
+++ tqm8xxl.c	20 Oct 2004 22:21:53 -0000	1.13
@@ -50,7 +50,7 @@
 static struct map_info* map_banks[FLASH_BANK_MAX];
 static struct mtd_part_def part_banks[FLASH_BANK_MAX];
 static unsigned long num_banks;
-static unsigned long start_scan_addr;
+static void __iomem *start_scan_addr;
 
 /*
  * Here are partition information for all known TQM8xxL series devices.
@@ -121,7 +121,7 @@
 	flash_size = bd->bi_flashsize;
 
 	//request maximum flash size address space
-	start_scan_addr = (unsigned long)ioremap(flash_addr, flash_size);
+	start_scan_addr = ioremap(flash_addr, flash_size);
 	if (!start_scan_addr) {
 		printk(KERN_WARNING "%s:Failed to ioremap address:0x%x\n", __FUNCTION__, flash_addr);
 		return -EIO;
@@ -155,7 +155,7 @@
 
 		simple_map_init(map_banks[idx]);
 
-		map_banks[idx]->virt = (void __iomem *)start_scan_addr;
+		map_banks[idx]->virt = start_scan_addr;
 		map_banks[idx]->phys = flash_addr;
 		/* FIXME: This looks utterly bogus, but I'm trying to
 		   preserve the behaviour of the original (shown here)...
@@ -231,7 +231,7 @@
 		}
 	}
 error:
-	iounmap((void *)start_scan_addr);
+	iounmap(start_scan_addr);
 	return ret;
 }
 
@@ -250,7 +250,7 @@
 	}
 
 	if (start_scan_addr) {
-		iounmap((void *)start_scan_addr);
+		iounmap(start_scan_addr);
 		start_scan_addr = 0;
 	}
 }