mtd/drivers/mtd/maps amd76xrom.c, 1.13, 1.14 arctic-mtd.c, 1.11, 1.12 autcpu12-nvram.c, 1.6, 1.7 beech-mtd.c, 1.8, 1.9 cdb89712.c, 1.8, 1.9 ceiva.c, 1.10, 1.11 cfi_flagadm.c, 1.12, 1.13 cstm_mips_ixx.c, 1.10, 1.11 db1550-flash.c, 1.3, 1.4 db1x00-flash.c, 1.3, 1.4 dbox2-flash.c, 1.11, 1.12 dc21285.c, 1.20, 1.21 dilnetpc.c, 1.13, 1.14 dmv182.c, 1.3, 1.4 ebony.c, 1.11, 1.12 edb7312.c, 1.11, 1.12 elan-104nc.c, 1.21, 1.22 epxa10db-flash.c, 1.11, 1.12 fortunet.c, 1.7, 1.8 h720x-flash.c, 1.9, 1.10 ichxrom.c, 1.10, 1.11 impa7.c, 1.11, 1.12 integrator-flash-v24.c, 1.13, 1.14 integrator-flash.c, 1.16, 1.17 ipaq-flash.c, 1.1, 1.2 iq80310.c, 1.18, 1.19 ixp2000.c, 1.2, 1.3 ixp4xx.c, 1.4, 1.5 l440gx.c, 1.13, 1.14 lasat.c, 1.7, 1.8 lubbock-flash.c, 1.16, 1.17 mbx860.c, 1.6, 1.7 mpc1211.c, 1.3, 1.4 netsc520.c, 1.10, 1.11 nettel.c, 1.5, 1.6 ocelot.c, 1.13, 1.14 ocotea.c, 1.1, 1.2 omap-toto-flash.c, 1.2, 1.3 pb1550-flash.c, 1.4, 1.5 pb1xxx-flash.c, 1.11, 1.12 physmap.c, 1.34, 1.35 pnc2000.c, 1.15, 1.16 redwood.c, 1.8, 1.9 rpxlite.c, 1.20, 1.21 sa1100-flash.c, 1.40, 1.41 sbc_gxx.c, 1.29, 1.30 sc520cdp.c, 1.16, 1.17 scb2_flash.c, 1.8, 1.9 scx200_docflash.c, 1.6, 1.7 solutionengine.c, 1.13, 1.14 sun_uflash.c, 1.9, 1.10 tqm8xxl.c, 1.11, 1.12 uclinux.c, 1.7, 1.8 wr_sbc82xx_flash.c, 1.5, 1.6

gleixner at infradead.org gleixner at infradead.org
Thu Sep 16 19:27:17 EDT 2004 

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

Modified Files:
	amd76xrom.c arctic-mtd.c autcpu12-nvram.c beech-mtd.c 
	cdb89712.c ceiva.c cfi_flagadm.c cstm_mips_ixx.c 
	db1550-flash.c db1x00-flash.c dbox2-flash.c dc21285.c 
	dilnetpc.c dmv182.c ebony.c edb7312.c elan-104nc.c 
	epxa10db-flash.c fortunet.c h720x-flash.c ichxrom.c impa7.c 
	integrator-flash-v24.c integrator-flash.c ipaq-flash.c 
	iq80310.c ixp2000.c ixp4xx.c l440gx.c lasat.c lubbock-flash.c 
	mbx860.c mpc1211.c netsc520.c nettel.c ocelot.c ocotea.c 
	omap-toto-flash.c pb1550-flash.c pb1xxx-flash.c physmap.c 
	pnc2000.c redwood.c rpxlite.c sa1100-flash.c sbc_gxx.c 
	sc520cdp.c scb2_flash.c scx200_docflash.c solutionengine.c 
	sun_uflash.c tqm8xxl.c uclinux.c wr_sbc82xx_flash.c 
Log Message:
Part 2 of the __iomem readb and friends overhaul

Index: amd76xrom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/amd76xrom.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- amd76xrom.c	12 Aug 2004 06:40:23 -0000	1.13
+++ amd76xrom.c	16 Sep 2004 23:27:12 -0000	1.14
@@ -170,7 +170,7 @@
 		map->map.name = map->map_name;
 		map->map.phys = map_top;
 		offset = map_top - window->phys;
-		map->map.virt = ((unsigned long)(window->virt)) + offset;
+		map->map.virt = ((void __iomem *)(window->virt)) + offset;
 		map->map.size = 0xffffffffUL - map_top + 1UL;
 		/* Set the name of the map to the address I am trying */
 		sprintf(map->map_name, "%s @%08lx",
@@ -224,7 +224,7 @@
 		}
 
 		/* Make the whole region visible in the map */
-		map->map.virt = (unsigned long)(window->virt);
+		map->map.virt = (void __iomem *)(window->virt);
 		map->map.phys = window->phys;
 		cfi = map->map.fldrv_priv;
 		for(i = 0; i < cfi->numchips; i++) {

Index: arctic-mtd.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/arctic-mtd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- arctic-mtd.c	12 Jul 2004 21:59:43 -0000	1.11
+++ arctic-mtd.c	16 Sep 2004 23:27:12 -0000	1.12
@@ -98,7 +98,7 @@
 {
 	printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
 
-	arctic_mtd_map.virt = (unsigned long) ioremap(PADDR, SIZE);
+	arctic_mtd_map.virt = (void __iomem *) ioremap(PADDR, SIZE);
 
 	if (!arctic_mtd_map.virt) {
 		printk("%s: failed to ioremap 0x%x\n", NAME, PADDR);

Index: autcpu12-nvram.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/autcpu12-nvram.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- autcpu12-nvram.c	12 Jul 2004 21:59:43 -0000	1.6
+++ autcpu12-nvram.c	16 Sep 2004 23:27:12 -0000	1.7
@@ -47,7 +47,7 @@
 {
 	int err, save0, save1;
 
-	autcpu12_sram_map.virt = (unsigned long)ioremap(0x12000000, SZ_128K);
+	autcpu12_sram_map.virt = (void __iomem *)ioremap(0x12000000, SZ_128K);
 	if (!autcpu12_sram_map.virt) {
 		printk("Failed to ioremap autcpu12 NV-RAM space\n");
 		err = -EIO;
@@ -76,7 +76,7 @@
 	/* We have a 128K found, restore 0x10000 and set size
 	 * to 128K
 	 */
-	ma[_write32(&autcpu12_sram_map,save1,0x10000);
+	map_write32(&autcpu12_sram_map,save1,0x10000);
 	autcpu12_sram_map.size = SZ_128K;
 
 map:

Index: beech-mtd.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/beech-mtd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- beech-mtd.c	12 Jul 2004 21:59:43 -0000	1.8
+++ beech-mtd.c	16 Sep 2004 23:27:12 -0000	1.9
@@ -74,7 +74,7 @@
 {
 	printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
 
-	beech_mtd_map.virt = (unsigned long) ioremap(PADDR, SIZE);
+	beech_mtd_map.virt = (void __iomem *) ioremap(PADDR, SIZE);
 
 	if (!beech_mtd_map.virt) {
 		printk("%s: failed to ioremap 0x%x\n", NAME, PADDR);

Index: cdb89712.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/cdb89712.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cdb89712.c	12 Jul 2004 21:59:43 -0000	1.8
+++ cdb89712.c	16 Sep 2004 23:27:12 -0000	1.9
@@ -44,7 +44,7 @@
 		goto out;
 	}
 	
-	cdb89712_flash_map.virt = (unsigned long)ioremap(FLASH_START, FLASH_SIZE);
+	cdb89712_flash_map.virt = (void __iomem *)ioremap(FLASH_START, FLASH_SIZE);
 	if (!cdb89712_flash_map.virt) {
 		printk(KERN_NOTICE "Failed to ioremap Cdb89712 FLASH space\n");
 		err = -EIO;
@@ -114,7 +114,7 @@
 		goto out;
 	}
 	
-	cdb89712_sram_map.virt = (unsigned long)ioremap(SRAM_START, SRAM_SIZE);
+	cdb89712_sram_map.virt = (void __iomem *)ioremap(SRAM_START, SRAM_SIZE);
 	if (!cdb89712_sram_map.virt) {
 		printk(KERN_NOTICE "Failed to ioremap Cdb89712 SRAM space\n");
 		err = -EIO;
@@ -182,7 +182,7 @@
 		goto out;
 	}
 	
-	cdb89712_bootrom_map.virt = (unsigned long)ioremap(BOOTROM_START, BOOTROM_SIZE);
+	cdb89712_bootrom_map.virt = (void __iomem *)ioremap(BOOTROM_START, BOOTROM_SIZE);
 	if (!cdb89712_bootrom_map.virt) {
 		printk(KERN_NOTICE "Failed to ioremap Cdb89712 BootROM space\n");
 		err = -EIO;

Index: ceiva.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ceiva.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ceiva.c	12 Jul 2004 21:59:43 -0000	1.10
+++ ceiva.c	16 Sep 2004 23:27:12 -0000	1.11
@@ -150,7 +150,7 @@
 			break;
 		}
 
-		clps[i].map->virt = (unsigned long)clps[i].vbase;
+		clps[i].map->virt = (void __iomem *)clps[i].vbase;
 		clps[i].map->bankwidth = clps[i].width;
 		clps[i].map->size = clps[i].size;
 

Index: cfi_flagadm.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/cfi_flagadm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cfi_flagadm.c	12 Jul 2004 21:59:43 -0000	1.12
+++ cfi_flagadm.c	16 Sep 2004 23:27:12 -0000	1.13
@@ -96,7 +96,7 @@
 			FLASH_SIZE, FLASH_PHYS_ADDR);
 	
 	flagadm_map.phys = FLASH_PHYS_ADDR;
-	flagadm_map.virt = (unsigned long)ioremap(FLASH_PHYS_ADDR,
+	flagadm_map.virt = (void __iomem *s)ioremap(FLASH_PHYS_ADDR,
 					FLASH_SIZE);
 
 	if (!flagadm_map.virt) {

Index: cstm_mips_ixx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/cstm_mips_ixx.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cstm_mips_ixx.c	12 Jul 2004 21:59:43 -0000	1.10
+++ cstm_mips_ixx.c	16 Sep 2004 23:27:12 -0000	1.11
@@ -170,7 +170,7 @@
 
 
 		cstm_mips_ixx_map[i].phys = cstm_mips_ixx_board_desc[i].window_addr;
-		cstm_mips_ixx_map[i].virt = (unsigned long)ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
+		cstm_mips_ixx_map[i].virt = (void __iomem *)ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
 		if (!cstm_mips_ixx_map[i].virt) {
 			printk(KERN_WARNING "Failed to ioremap\n");
 			return -EIO;

Index: db1550-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/db1550-flash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- db1550-flash.c	14 Jul 2004 17:45:40 -0000	1.3
+++ db1550-flash.c	16 Sep 2004 23:27:12 -0000	1.4
@@ -163,7 +163,7 @@
 	printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n", 
 			db1550_map.bankwidth*8);
 	db1550_map.virt = 
-		(unsigned long)ioremap(window_addr, window_size);
+		(void __iomem *)ioremap(window_addr, window_size);
 	mymtd = do_map_probe("cfi_probe", &db1550_map);
 	if (!mymtd) return -ENXIO;
 	mymtd->owner = THIS_MODULE;

Index: db1x00-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/db1x00-flash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- db1x00-flash.c	14 Jul 2004 17:45:40 -0000	1.3
+++ db1x00-flash.c	16 Sep 2004 23:27:12 -0000	1.4
@@ -192,7 +192,7 @@
 	 */
 	printk(KERN_NOTICE "Db1xxx flash: probing %d-bit flash bus\n", 
 			db1xxx_mtd_map.bankwidth*8);
-	db1xxx_mtd_map.virt = (unsigned long)ioremap(window_addr, window_size);
+	db1xxx_mtd_map.virt = (void __iomem *)ioremap(window_addr, window_size);
 	db1xxx_mtd = do_map_probe("cfi_probe", &db1xxx_mtd_map);
 	if (!db1xxx_mtd) return -ENXIO;
 	db1xxx_mtd->owner = THIS_MODULE;

Index: dbox2-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dbox2-flash.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dbox2-flash.c	12 Jul 2004 21:59:43 -0000	1.11
+++ dbox2-flash.c	16 Sep 2004 23:27:12 -0000	1.12
@@ -75,7 +75,7 @@
 int __init init_dbox2_flash(void)
 {
        	printk(KERN_NOTICE "D-Box 2 flash driver (size->0x%X mem->0x%X)\n", WINDOW_SIZE, WINDOW_ADDR);
-	dbox2_flash_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+	dbox2_flash_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
 	if (!dbox2_flash_map.virt) {
 		printk("Failed to ioremap\n");

Index: dc21285.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dc21285.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dc21285.c	12 Jul 2004 22:38:29 -0000	1.20
+++ dc21285.c	16 Sep 2004 23:27:13 -0000	1.21
@@ -175,7 +175,7 @@
 		dc21285_map.bankwidth*8);
 
 	/* Let's map the flash area */
-	dc21285_map.map_priv_1 = (unsigned long)ioremap(DC21285_FLASH, 16*1024*1024);
+	dc21285_map.map_priv_1 = (void __iomem *)ioremap(DC21285_FLASH, 16*1024*1024);
 	if (!dc21285_map.map_priv_1) {
 		printk("Failed to ioremap\n");
 		return -EIO;

Index: dilnetpc.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dilnetpc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dilnetpc.c	12 Jul 2004 21:59:44 -0000	1.13
+++ dilnetpc.c	16 Sep 2004 23:27:13 -0000	1.14
@@ -403,7 +403,7 @@
 	printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%lx\n", 
 		is_dnp ? "DNPC" : "ADNP", dnpc_map.size, dnpc_map.phys);
 
-	dnpc_map.virt = (unsigned long)ioremap_nocache(dnpc_map.phys, dnpc_map.size);
+	dnpc_map.virt = (void __iomem *)ioremap_nocache(dnpc_map.phys, dnpc_map.size);
 
 	dnpc_map_flash(dnpc_map.phys, dnpc_map.size);
 

Index: dmv182.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/dmv182.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dmv182.c	14 Jul 2004 17:45:40 -0000	1.3
+++ dmv182.c	16 Sep 2004 23:27:13 -0000	1.4
@@ -104,7 +104,7 @@
 	partitions = svme182_partitions;
 
 	svme182_map.virt = 
-		(unsigned long)ioremap(FLASH_BASE_ADDR, svme182_map.size);
+		(void __iomem *)ioremap(FLASH_BASE_ADDR, svme182_map.size);
 		
 	if (svme182_map.virt == 0) {
 		printk("Failed to ioremap FLASH memory area.\n");

Index: ebony.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ebony.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ebony.c	23 Aug 2004 20:38:26 -0000	1.11
+++ ebony.c	16 Sep 2004 23:27:13 -0000	1.12
@@ -94,7 +94,7 @@
 
 	ebony_small_map.phys = small_flash_base;
 	ebony_small_map.virt =
-		(unsigned long)ioremap64(small_flash_base,
+		(void __iomem *)ioremap64(small_flash_base,
 					 ebony_small_map.size);
 
 	if (!ebony_small_map.virt) {

Index: edb7312.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/edb7312.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- edb7312.c	14 Jul 2004 09:52:55 -0000	1.11
+++ edb7312.c	16 Sep 2004 23:27:13 -0000	1.12
@@ -82,8 +82,8 @@
 
        	printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n", 
 	       WINDOW_SIZE, WINDOW_ADDR);
-	edb7312nor_map.virt = (unsigned long)
-	  ioremap(WINDOW_ADDR, WINDOW_SIZE);
+	edb7312nor_map.virt = (void __iomem *)
+		ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
 	if (!edb7312nor_map.virt) {
 		printk(MSG_PREFIX "failed to ioremap\n");

Index: elan-104nc.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/elan-104nc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- elan-104nc.c	12 Jul 2004 22:38:29 -0000	1.21
+++ elan-104nc.c	16 Sep 2004 23:27:13 -0000	1.22
@@ -53,7 +53,7 @@
 #define PAGE_IO_SIZE 2
 
 static volatile int page_in_window = -1; // Current page in window.
-static unsigned long iomapadr;
+static void __iomem *iomapadr;
 static spinlock_t elan_104nc_spin = SPIN_LOCK_UNLOCKED;
 
 /* partition_info gives details on the logical partitions that the split the 
@@ -190,7 +190,7 @@
 	/* Urg! We use I/O port 0x22 without request_region()ing it,
 	   because it's already allocated to the PIC. */
 
-  	iomapadr = (unsigned long)ioremap(WINDOW_START, WINDOW_LENGTH);
+  	iomapadr = (void __iomem *)ioremap(WINDOW_START, WINDOW_LENGTH);
 	if (!iomapadr) {
 		printk( KERN_ERR"%s: failed to ioremap memory region\n",
 			elan_104nc_map.name );

Index: epxa10db-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/epxa10db-flash.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- epxa10db-flash.c	12 Jul 2004 21:59:44 -0000	1.11
+++ epxa10db-flash.c	16 Sep 2004 23:27:13 -0000	1.12
@@ -62,7 +62,7 @@
 	
 	printk(KERN_NOTICE "%s flash device: 0x%x at 0x%x\n", BOARD_NAME, FLASH_SIZE, FLASH_START);
 
-	epxa_map.virt = (unsigned long)ioremap(FLASH_START, FLASH_SIZE);
+	epxa_map.virt = (void __iomem *)ioremap(FLASH_START, FLASH_SIZE);
 	if (!epxa_map.virt) {
 		printk("Failed to ioremap %s flash\n",BOARD_NAME);
 		return -EIO;

Index: fortunet.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/fortunet.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fortunet.c	12 Jul 2004 21:59:44 -0000	1.7
+++ fortunet.c	16 Sep 2004 23:27:13 -0000	1.8
@@ -210,7 +210,7 @@
 			map_regions[ix].map_info.phys =	map_regions[ix].window_addr_physical,
 
 			map_regions[ix].map_info.virt =
-				(int)ioremap_nocache(
+				(void __iomem *)ioremap_nocache(
 				map_regions[ix].window_addr_physical,
 				map_regions[ix].map_info.size);
 			if(!map_regions[ix].map_info.virt)

Index: h720x-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/h720x-flash.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- h720x-flash.c	14 Jul 2004 17:45:40 -0000	1.9
+++ h720x-flash.c	16 Sep 2004 23:27:13 -0000	1.10
@@ -73,7 +73,7 @@
 
 	char	*part_type = NULL;
 	
-	h720x_map.virt = (unsigned long)ioremap(FLASH_PHYS, FLASH_SIZE);
+	h720x_map.virt = (void __iomem *)ioremap(FLASH_PHYS, FLASH_SIZE);
 
 	if (!h720x_map.virt) {
 		printk(KERN_ERR "H720x-MTD: ioremap failed\n");

Index: ichxrom.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ichxrom.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ichxrom.c	12 Aug 2004 07:49:04 -0000	1.10
+++ ichxrom.c	16 Sep 2004 23:27:13 -0000	1.11
@@ -224,7 +224,7 @@
 		map->map.name = map->map_name;
 		map->map.phys = map_top;
 		offset = map_top - window->phys;
-		map->map.virt = ((unsigned long)(window->virt)) + offset;
+		map->map.virt = ((void __iomem *)(window->virt)) + offset;
 		map->map.size = 0xffffffffUL - map_top + 1UL;
 		/* Set the name of the map to the address I am trying */
 		sprintf(map->map_name, "%s @%08lx",
@@ -281,7 +281,7 @@
 		}
 
 		/* Make the whole region visible in the map */
-		map->map.virt = (unsigned long)(window->virt);
+		map->map.virt = (void __iomem *)(window->virt);
 		map->map.phys = window->phys;
 		cfi = map->map.fldrv_priv;
 		for(i = 0; i < cfi->numchips; i++) {

Index: impa7.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/impa7.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- impa7.c	14 Jul 2004 09:52:55 -0000	1.11
+++ impa7.c	16 Sep 2004 23:27:13 -0000	1.12
@@ -91,7 +91,7 @@
 		       pt[i].size, pt[i].addr);
 
 		impa7_map[i].phys = pt[i].addr;
-		impa7_map[i].virt = (unsigned long)
+		impa7_map[i].virt = (void __iomem *)
 		  ioremap(pt[i].addr, pt[i].size);
 		if (!impa7_map[i].virt) {
 			printk(MSG_PREFIX "failed to ioremap\n");

Index: integrator-flash-v24.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/integrator-flash-v24.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- integrator-flash-v24.c	12 Jul 2004 21:59:44 -0000	1.13
+++ integrator-flash-v24.c	16 Sep 2004 23:27:13 -0000	1.14
@@ -175,7 +175,7 @@
 	 */
 	armflash_map.size       = size;
 	armflash_map.bankwidth   = 4;
-	armflash_map.virt = (unsigned long) base;
+	armflash_map.virt = (void __iomem *) base;
 
 	simple_map_init(&armflash_map);
 

Index: integrator-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/integrator-flash.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- integrator-flash.c	12 Jul 2004 21:59:44 -0000	1.16
+++ integrator-flash.c	16 Sep 2004 23:27:13 -0000	1.17
@@ -110,7 +110,7 @@
 	info->map.size		= size;
 	info->map.bankwidth	= plat->width;
 	info->map.phys		= res->start;
-	info->map.virt		= (unsigned long) base;
+	info->map.virt		= (void __iomem *) base;
 	info->map.name		= dev->dev.bus_id;
 	info->map.set_vpp	= armflash_set_vpp;
 

Index: ipaq-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ipaq-flash.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipaq-flash.c	24 Aug 2004 19:06:09 -0000	1.1
+++ ipaq-flash.c	16 Sep 2004 23:27:13 -0000	1.2
@@ -246,7 +246,7 @@
 			ipaq_map[i].size = h3xxx_max_flash_size;
 			ipaq_map[i].set_vpp = h3xxx_set_vpp;
 			ipaq_map[i].phys = cs_phys[i];
-			ipaq_map[i].virt = (__u32)__ioremap(cs_phys[i], 0x04000000, 0, 1);
+			ipaq_map[i].virt = (void __iomem *)__ioremap(cs_phys[i], 0x04000000, 0, 1);
 			if (machine_is_h3100 () || machine_is_h1900())
 				ipaq_map[i].bankwidth = 2;
 		}
@@ -443,7 +443,7 @@
 	ipaq_map[0].size = 0x80000;
 	ipaq_map[0].set_vpp = h3xxx_set_vpp;
 	ipaq_map[0].phys = 0x0;
-	ipaq_map[0].virt = (__u32)__ioremap(0x0, 0x04000000, 0, 1);
+	ipaq_map[0].virt = (void __iomem *)__ioremap(0x0, 0x04000000, 0, 1);
 	ipaq_map[0].bankwidth = 2;
 	
 	printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);

Index: iq80310.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/iq80310.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- iq80310.c	12 Jul 2004 21:59:44 -0000	1.18
+++ iq80310.c	16 Sep 2004 23:27:13 -0000	1.19
@@ -68,7 +68,7 @@
 	int parsed_nr_parts = 0;
 	int ret;
 
-	iq80310_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+	iq80310_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
 	if (!iq80310_map.virt) {
 		printk("Failed to ioremap\n");
 		return -EIO;

Index: ixp2000.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ixp2000.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ixp2000.c	14 Sep 2004 20:56:21 -0000	1.2
+++ ixp2000.c	16 Sep 2004 23:27:13 -0000	1.3
@@ -191,7 +191,7 @@
 	/*
  	 * map_priv_2 is used to store a ptr to to the bank_setup routine
  	 */
-	info->map.map_priv_2 = (u32) ixp_data->bank_setup;
+	info->map.map_priv_2 = (void __iomem *) ixp_data->bank_setup;
 
 	info->map.name = dev->dev.bus_id;
 	info->map.read = ixp2000_flash_read8;
@@ -209,7 +209,7 @@
 	}
 
 	info->map.map_priv_1 =
-	    (unsigned long) ioremap(dev->resource->start, 
+	    (void __iomem *) ioremap(dev->resource->start, 
 				    dev->resource->end - dev->resource->start + 1);
 	if (!info->map.map_priv_1) {
 		dev_err(_dev, "Failed to ioremap flash region\n");

Index: ixp4xx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ixp4xx.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ixp4xx.c	31 Aug 2004 22:55:51 -0000	1.4
+++ ixp4xx.c	16 Sep 2004 23:27:13 -0000	1.5
@@ -184,7 +184,7 @@
 	}
 
 	info->map.map_priv_1 =
-	    (unsigned long) ioremap(dev->resource->start, 
+	    (void __iomem *) ioremap(dev->resource->start, 
 				    dev->resource->end - dev->resource->start + 1);
 	if (!info->map.map_priv_1) {
 		printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");

Index: l440gx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/l440gx.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- l440gx.c	12 Jul 2004 21:59:44 -0000	1.13
+++ l440gx.c	16 Sep 2004 23:27:13 -0000	1.14
@@ -73,7 +73,7 @@
 		return -ENODEV;
 	}
 
-	l440gx_map.virt = (unsigned long)ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
+	l440gx_map.virt = (void __iomem *)ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
 
 	if (!l440gx_map.virt) {
 		printk(KERN_WARNING "Failed to ioremap L440GX flash region\n");

Index: lasat.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lasat.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lasat.c	12 Jul 2004 21:59:44 -0000	1.7
+++ lasat.c	16 Sep 2004 23:27:13 -0000	1.8
@@ -50,7 +50,7 @@
 	ENABLE_VPP((&lasat_map));
 
 	lasat_map.phys = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
-	lasat_map.virt = (unsigned long)ioremap_nocache(
+	lasat_map.virt = (void __iomem *)ioremap_nocache(
 		        lasat_map.phys, lasat_board_info.li_flash_size);
 	lasat_map.size = lasat_board_info.li_flash_size;
 

Index: lubbock-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lubbock-flash.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lubbock-flash.c	26 Aug 2004 21:09:40 -0000	1.16
+++ lubbock-flash.c	16 Sep 2004 23:27:13 -0000	1.17
@@ -82,7 +82,7 @@
 	lubbock_maps[flashboot].name = "Lubbock Boot ROM";
 
 	for (i = 0; i < 2; i++) {
-		lubbock_maps[i].virt = (unsigned long)ioremap(lubbock_maps[i].phys, WINDOW_SIZE);
+		lubbock_maps[i].virt = (void __iomem *)ioremap(lubbock_maps[i].phys, WINDOW_SIZE);
 		if (!lubbock_maps[i].virt) {
 			printk(KERN_WARNING "Failed to ioremap %s\n", lubbock_maps[i].name);
 			if (!ret)

Index: mbx860.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/mbx860.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mbx860.c	12 Jul 2004 21:59:44 -0000	1.6
+++ mbx860.c	16 Sep 2004 23:27:13 -0000	1.7
@@ -60,7 +60,7 @@
 int __init init_mbx(void)
 {
 	printk(KERN_NOTICE "Motorola MBX flash device: 0x%x at 0x%x\n", WINDOW_SIZE*4, WINDOW_ADDR);
-	mbx_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
+	mbx_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
 
 	if (!mbx_map.virt) {
 		printk("Failed to ioremap\n");

Index: mpc1211.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/mpc1211.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpc1211.c	14 Jul 2004 17:45:40 -0000	1.3
+++ mpc1211.c	16 Sep 2004 23:27:13 -0000	1.4
@@ -44,7 +44,7 @@
 	int nr_parts;
 
 	mpc1211_flash_map.phys = 0;
-	mpc1211_flash_map.virt = P2SEGADDR(0);
+	mpc1211_flash_map.virt = (void __iomem *)P2SEGADDR(0);
 
 	simple_map_init(&mpc1211_flash_map);
 

Index: netsc520.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/netsc520.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- netsc520.c	12 Jul 2004 21:59:44 -0000	1.10
+++ netsc520.c	16 Sep 2004 23:27:13 -0000	1.11
@@ -95,7 +95,7 @@
 static int __init init_netsc520(void)
 {
 	printk(KERN_NOTICE "NetSc520 flash device: 0x%lx at 0x%lx\n", netsc520_map.size, netsc520_map.phys);
-	netsc520_map.virt = (unsigned long)ioremap_nocache(netsc520_map.phys, netsc520_map.size);
+	netsc520_map.virt = (void __iomem *)ioremap_nocache(netsc520_map.phys, netsc520_map.size);
 
 	if (!netsc520_map.virt) {
 		printk("Failed to ioremap_nocache\n");

Index: nettel.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/nettel.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nettel.c	12 Jul 2004 21:59:44 -0000	1.5
+++ nettel.c	16 Sep 2004 23:27:13 -0000	1.6
@@ -273,8 +273,7 @@
 	__asm__ ("wbinvd");
 
 	nettel_amd_map.phys = amdaddr;
-	nettel_amd_map.virt = (unsigned long)
-		ioremap_nocache(amdaddr, maxsize);
+	nettel_amd_map.virt = (void __iomem *) ioremap_nocache(amdaddr, maxsize);
 	if (!nettel_amd_map.virt) {
 		printk("SNAPGEAR: failed to ioremap() BOOTCS\n");
 		return(-EIO);

Index: ocelot.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ocelot.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocelot.c	12 Jul 2004 21:59:44 -0000	1.13
+++ ocelot.c	16 Sep 2004 23:27:13 -0000	1.14
@@ -81,7 +81,7 @@
 	iounmap(pld);
 
 	/* Now ioremap the NVRAM space */
-	ocelot_nvram_map.virt = (unsigned long)ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
+	ocelot_nvram_map.virt = (void __iomem *)ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
 	if (!ocelot_nvram_map.virt) {
 		printk(KERN_NOTICE "Failed to ioremap Ocelot NVRAM space\n");
 		return -EIO;
@@ -101,7 +101,7 @@
 	nvram_mtd->write = ocelot_ram_write;
 
 	/* Now map the flash space */
-	ocelot_flash_map.virt = (unsigned long)ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
+	ocelot_flash_map.virt = (void __iomem *)ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
 	if (!ocelot_flash_map.virt) {
 		printk(KERN_NOTICE "Failed to ioremap Ocelot flash space\n");
 		goto fail_2;

Index: ocotea.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/ocotea.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocotea.c	23 Aug 2004 20:38:26 -0000	1.1
+++ ocotea.c	16 Sep 2004 23:27:13 -0000	1.2
@@ -85,7 +85,7 @@
 
 	ocotea_small_map.phys = small_flash_base;
 	ocotea_small_map.virt =
-		(unsigned long)ioremap64(small_flash_base,
+		(void __iomem *)ioremap64(small_flash_base,
 					 ocotea_small_map.size);
 
 	if (!ocotea_small_map.virt) {
@@ -107,7 +107,7 @@
 
 	ocotea_large_map.phys = large_flash_base;
 	ocotea_large_map.virt =
-		(unsigned long)ioremap64(large_flash_base,
+		(void __iomem *)ioremap64(large_flash_base,
 					 ocotea_large_map.size);
 
 	if (!ocotea_large_map.virt) {

Index: omap-toto-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/omap-toto-flash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- omap-toto-flash.c	12 Jul 2004 21:59:44 -0000	1.2
+++ omap-toto-flash.c	16 Sep 2004 23:27:13 -0000	1.3
@@ -35,7 +35,7 @@
 static struct map_info omap_toto_map_flash = {
 	.name =		"OMAP Toto flash",
 	.bankwidth =	2,
-	.virt =		OMAP_TOTO_FLASH_BASE,
+	.virt =		(void __iomem *)OMAP_TOTO_FLASH_BASE,
 };
 
  

Index: pb1550-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/pb1550-flash.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pb1550-flash.c	14 Jul 2004 17:45:40 -0000	1.4
+++ pb1550-flash.c	16 Sep 2004 23:27:13 -0000	1.5
@@ -179,7 +179,7 @@
 	printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n", 
 			pb1550_map.bankwidth*8);
 	pb1550_map.virt = 
-		(unsigned long)ioremap(window_addr, window_size);
+		(void __iomem *)ioremap(window_addr, window_size);
 	mymtd = do_map_probe("cfi_probe", &pb1550_map);
 	if (!mymtd) return -ENXIO;
 	mymtd->owner = THIS_MODULE;

Index: pb1xxx-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/pb1xxx-flash.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pb1xxx-flash.c	12 Jul 2004 21:59:44 -0000	1.11
+++ pb1xxx-flash.c	16 Sep 2004 23:27:13 -0000	1.12
@@ -150,7 +150,7 @@
 	 */
 	printk(KERN_NOTICE "Pb1xxx flash: probing %d-bit flash bus\n", 
 			BUSWIDTH*8);
-	pb1xxx_mtd_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+	pb1xxx_mtd_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
 	simple_map_init(&pb1xxx_mtd_map);
 

Index: physmap.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/physmap.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- physmap.c	21 Jul 2004 00:16:14 -0000	1.34
+++ physmap.c	16 Sep 2004 23:27:13 -0000	1.35
@@ -51,7 +51,7 @@
 	const char **type;
 
        	printk(KERN_NOTICE "physmap flash device: %lx at %lx\n", physmap_map.size, physmap_map.phys);
-	physmap_map.virt = (unsigned long)ioremap(physmap_map.phys, physmap_map.size);
+	physmap_map.virt = (void __iomem *)ioremap(physmap_map.phys, physmap_map.size);
 
 	if (!physmap_map.virt) {
 		printk("Failed to ioremap\n");

Index: pnc2000.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/pnc2000.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pnc2000.c	12 Jul 2004 21:59:44 -0000	1.15
+++ pnc2000.c	16 Sep 2004 23:27:13 -0000	1.16
@@ -31,7 +31,7 @@
 	.size = WINDOW_SIZE,
 	.bankwidth = 4,
 	.phys = 0xFFFFFFFF,
-	.virt = WINDOW_ADDR,
+	.virt = (void __iomem *)WINDOW_ADDR,
 };
 
 

Index: redwood.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/redwood.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- redwood.c	12 Jul 2004 21:59:44 -0000	1.8
+++ redwood.c	16 Sep 2004 23:27:13 -0000	1.9
@@ -132,7 +132,7 @@
 			WINDOW_SIZE, WINDOW_ADDR);
 
 	redwood_flash_map.virt =
-		(unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+		(void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
 	if (!redwood_flash_map.virt) {
 		printk("init_redwood_flash: failed to ioremap\n");

Index: rpxlite.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/rpxlite.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpxlite.c	12 Jul 2004 21:59:44 -0000	1.20
+++ rpxlite.c	16 Sep 2004 23:27:13 -0000	1.21
@@ -28,7 +28,7 @@
 int __init init_rpxlite(void)
 {
 	printk(KERN_NOTICE "RPX Lite or CLLF flash device: %x at %x\n", WINDOW_SIZE*4, WINDOW_ADDR);
-	rpxlite_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
+	rpxlite_map.virt = (void __iomem *)ioremap(WINDOW_ADDR, WINDOW_SIZE * 4);
 
 	if (!rpxlite_map.virt) {
 		printk("Failed to ioremap\n");

Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sa1100-flash.c	24 Aug 2004 18:52:05 -0000	1.40
+++ sa1100-flash.c	16 Sep 2004 23:27:13 -0000	1.41
@@ -964,7 +964,7 @@
 			break;
 		}
 
-		sa[i].map->virt = (unsigned long)sa[i].vbase;
+		sa[i].map->virt = (void __iomem *)sa[i].vbase;
 		sa[i].map->phys = sa[i].base;
 		sa[i].map->set_vpp = sa[i].set_vpp;
 		sa[i].map->bankwidth = sa[i].width;
@@ -1101,7 +1101,7 @@
 	sa1100_probe_map.bankwidth = msc & MSC_RBW ? 2 : 4;
 	sa1100_probe_map.size = SZ_1M;
 	sa1100_probe_map.phys = phys;
-	sa1100_probe_map.virt = (unsigned long)ioremap(phys, SZ_1M);
+	sa1100_probe_map.virt = (void __iomem *)ioremap(phys, SZ_1M);
 	if (sa1100_probe_map.virt == 0)
 		goto fail;
 	simple_map_init(&sa1100_probe_map);

Index: sbc_gxx.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sbc_gxx.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sbc_gxx.c	12 Jul 2004 22:38:29 -0000	1.29
+++ sbc_gxx.c	16 Sep 2004 23:27:14 -0000	1.30
@@ -84,7 +84,7 @@
 // Globals
 
 static volatile int page_in_window = -1; // Current page in window.
-static unsigned long iomapadr;
+static void __iomem *iomapadr;
 static spinlock_t sbc_gxx_spin = SPIN_LOCK_UNLOCKED;
 
 /* partition_info gives details on the logical partitions that the split the 
@@ -195,7 +195,7 @@
 
 int __init init_sbc_gxx(void)
 {
-  	iomapadr = (unsigned long)ioremap(WINDOW_START, WINDOW_LENGTH);
+  	iomapadr = (void __iomem *)ioremap(WINDOW_START, WINDOW_LENGTH);
 	if (!iomapadr) {
 		printk( KERN_ERR"%s: failed to ioremap memory region\n",
 			sbc_gxx_map.name );

Index: sc520cdp.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sc520cdp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sc520cdp.c	12 Jul 2004 21:59:45 -0000	1.16
+++ sc520cdp.c	16 Sep 2004 23:27:14 -0000	1.17
@@ -241,7 +241,7 @@
 		printk(KERN_NOTICE "SC520 CDP flash device: 0x%lx at 0x%lx\n",
 		       sc520cdp_map[i].size, sc520cdp_map[i].phys);
 
-		sc520cdp_map[i].virt = (unsigned long)ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);
+		sc520cdp_map[i].virt = (void __iomem *)ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);
 
 		if (!sc520cdp_map[i].virt) {
 			printk("Failed to ioremap_nocache\n");

Index: scb2_flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/scb2_flash.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scb2_flash.c	12 Jul 2004 21:59:45 -0000	1.8
+++ scb2_flash.c	16 Sep 2004 23:27:14 -0000	1.9
@@ -163,7 +163,7 @@
 	}
 
 	scb2_map.phys = SCB2_ADDR;
-	scb2_map.virt = (unsigned long)scb2_ioaddr;
+	scb2_map.virt = (void __iomem *)scb2_ioaddr;
 	scb2_map.size = SCB2_WINDOW;
 
 	simple_map_init(&scb2_map);

Index: scx200_docflash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/scx200_docflash.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scx200_docflash.c	12 Jul 2004 21:59:45 -0000	1.6
+++ scx200_docflash.c	16 Sep 2004 23:27:14 -0000	1.7
@@ -180,7 +180,7 @@
 	simple_map_init(&scx200_docflash_map);
 
 	scx200_docflash_map.phys = docmem.start;
-	scx200_docflash_map.virt = (unsigned long)ioremap(docmem.start, scx200_docflash_map.size);
+	scx200_docflash_map.virt = (void __iomem *)ioremap(docmem.start, scx200_docflash_map.size);
 	if (!scx200_docflash_map.virt) {
 		printk(KERN_ERR NAME ": failed to ioremap the flash\n");
 		release_resource(&docmem);

Index: solutionengine.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/solutionengine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- solutionengine.c	12 Jul 2004 21:59:45 -0000	1.13
+++ solutionengine.c	16 Sep 2004 23:27:14 -0000	1.14
@@ -62,9 +62,9 @@
 
 	/* First probe at offset 0 */
 	soleng_flash_map.phys = 0;
-	soleng_flash_map.virt = P2SEGADDR(0);
+	soleng_flash_map.virt = (void __iomem *)P2SEGADDR(0);
 	soleng_eprom_map.phys = 0x01000000;
-	soleng_eprom_map.virt = P1SEGADDR(0x01000000);
+	soleng_eprom_map.virt = (void __iomem *)P1SEGADDR(0x01000000);
 	simple_map_init(&soleng_eprom_map);
 	simple_map_init(&soleng_flash_map);
 	

Index: sun_uflash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sun_uflash.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sun_uflash.c	12 Jul 2004 21:59:45 -0000	1.9
+++ sun_uflash.c	16 Sep 2004 23:27:14 -0000	1.10
@@ -97,7 +97,7 @@
 	}
 	pdev->map.phys = edev->resource[0].start;
 	pdev->map.virt = 
-		(unsigned long)ioremap_nocache(edev->resource[0].start, pdev->map.size);
+		(void __iomem *)ioremap_nocache(edev->resource[0].start, pdev->map.size);
 	if(0 == pdev->map.virt) {
 		printk("%s: failed to map device\n", __FUNCTION__);
 		kfree(pdev->name);

Index: tqm8xxl.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/tqm8xxl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tqm8xxl.c	12 Jul 2004 21:59:45 -0000	1.11
+++ tqm8xxl.c	16 Sep 2004 23:27:14 -0000	1.12
@@ -155,7 +155,7 @@
 
 		simple_map_init(map_banks[idx]);
 
-		map_banks[idx]->virt = start_scan_addr;
+		map_banks[idx]->virt = (void __iomem *)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)...

Index: uclinux.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/uclinux.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- uclinux.c	12 Jul 2004 21:59:45 -0000	1.7
+++ uclinux.c	16 Sep 2004 23:27:14 -0000	1.8
@@ -69,7 +69,7 @@
 	printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
 	       	(int) mapp->map_priv_2, (int) mapp->size);
 
-	mapp->virt = (unsigned long)
+	mapp->virt = (void __iomem *)
 		ioremap_nocache(mapp->phys, mapp->size);
 
 	if (mapp->virt == 0) {

Index: wr_sbc82xx_flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/wr_sbc82xx_flash.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wr_sbc82xx_flash.c	15 Jul 2004 14:52:02 -0000	1.5
+++ wr_sbc82xx_flash.c	16 Sep 2004 23:27:14 -0000	1.6
@@ -116,7 +116,7 @@
 		}
 		printk(" at %08lx)\n",  sbc82xx_flash_map[i].phys);
 
-		sbc82xx_flash_map[i].virt = (unsigned long)ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size);
+		sbc82xx_flash_map[i].virt = (void __iomem *)ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size);
 
 		if (!sbc82xx_flash_map[i].virt) {
 			printk("Failed to ioremap\n");

More information about the linux-mtd-cvs mailing list