From: Alan Cox <alan@lxorguk.ukuu.org.uk>

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/ata/pata_marvell.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff -puN drivers/ata/pata_marvell.c~pata_marvell-switch-to-pci_iomap-as-jeff-asked drivers/ata/pata_marvell.c
--- a/drivers/ata/pata_marvell.c~pata_marvell-switch-to-pci_iomap-as-jeff-asked
+++ a/drivers/ata/pata_marvell.c
@@ -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,8 +39,7 @@ static int marvell_pre_reset(struct ata_
 
 	/* 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:");
@@ -49,7 +48,7 @@ static int marvell_pre_reset(struct ata_
 	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;
_