[PATCH] pata_marvell: switch to pci_iomap as Jeff asked

[Alan Cox]

Signed-off-by: Alan Cox <alan@xxxxxxxxxx>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc2-mm1/drivers/ata/pata_marvell.c linux-2.6.19-rc2-mm1/drivers/ata/pata_marvell.c
--- linux.vanilla-2.6.19-rc2-mm1/drivers/ata/pata_marvell.c	2006-10-18 13:51:02.000000000 +0100
+++ linux-2.6.19-rc2-mm1/drivers/ata/pata_marvell.c	2006-10-18 13:56:55.000000000 +0100
@@ -20,7 +20,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME	"pata_marvell"
-#define DRV_VERSION	"0.0.4t"
+#define DRV_VERSION	"0.0.5t"
 
 /**
  *	marvell_pre_reset	-	check for 40/80 pin
@@ -39,18 +39,17 @@
 
 	/* Check if our port is enabled */
 
-	bar5 = pci_resource_start(pdev, 5);
-	barp = ioremap(bar5, 0x10);
+	barp = pci_ioremap(pdev, 5, 0x10);
 	if (barp == NULL)
 		return -ENOMEM;
 	printk("BAR5:");
 	for(i = 0; i <= 0x0F; i++)
 		printk("%02X:%02X ", i, readb(barp + i));
 	printk("\n");
-
+	
 	devices = readl(barp + 0x0C);
-	iounmap(barp);
-
+	pci_iounmap(pdev, barp);
+	
 	if (pdev->device == 0x6145 && ap->port_no == 0 && !(devices & 0x10))	/* PATA enable ? */
 		return -ENOENT;
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/