X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmtd%2Fmaps%2Famd76xrom.c;h=b4331273127098a17923ba6025d939c770e14066;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=7f3ab37689041a2125ac77dbbd2c918363820ed0;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 7f3ab3768..b43312731 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -26,7 +26,7 @@
 struct amd76xrom_map_info {
 	struct map_info map;
 	struct mtd_info *mtd;
-	unsigned long window_addr;
+	void __iomem * window_addr;
 	u32 window_start, window_size;
 	struct pci_dev *pdev;
 	struct resource window_rsrc;
@@ -57,7 +57,7 @@ static void amd76xrom_cleanup(struct amd76xrom_map_info *info)
 		del_mtd_device(info->mtd);
 		map_destroy(info->mtd);
 		info->mtd = NULL;
-		info->map.virt = 0;
+		info->map.virt = NULL;
 	}
 	if (info->rom_rsrc.parent)
 		release_resource(&info->rom_rsrc);
@@ -65,8 +65,8 @@ static void amd76xrom_cleanup(struct amd76xrom_map_info *info)
 		release_resource(&info->window_rsrc);
 
 	if (info->window_addr) {
-		iounmap((void *)(info->window_addr));
-		info->window_addr = 0;
+		iounmap(info->window_addr);
+		info->window_addr = NULL;
 	}
 }
 
@@ -136,8 +136,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
 		printk(KERN_NOTICE MOD_NAME " window : %x at %x\n", 
 		       window->size, window->start);
 		/* For write accesses caches are useless */
-		info->window_addr =
-			(unsigned long)ioremap_nocache(window->start,
+		info->window_addr = ioremap_nocache(window->start,
 						       window->size);
 
 		if (!info->window_addr) {
@@ -163,8 +162,8 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
 			}
 			if (info->mtd) goto found_mtd;
 		}
-		iounmap((void *)(info->window_addr));
-		info->window_addr = 0;
+		iounmap(info->window_addr);
+		info->window_addr = NULL;
 
 		/* Disable writes through the rom window */
 		pci_read_config_byte(pdev, 0x40, &byte);