summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-10-02 22:53:01 +0200
committerJeff Garzik <jeff@garzik.org>2007-10-03 20:43:27 +0200
commit90925d3050253ff7b4f5d1660071df75f44bd0ff (patch)
treef9a7f090d868dabdd8fd796c2b7bf6ace1d945b0 /drivers/ata
parentlibata: fix for sata_mv >64KB DMA segments (diff)
downloadlinux-90925d3050253ff7b4f5d1660071df75f44bd0ff.tar.xz
linux-90925d3050253ff7b4f5d1660071df75f44bd0ff.zip
Ata: pata_marvell, use ioread* for iomap-ped memory
pata_marvell, use ioread* for iomap-ped memory read* on pci_iomapped memory is incorrect, fix it Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_marvell.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index ae206f35f747..b45506f1ef73 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -44,10 +44,10 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline)
return -ENOMEM;
printk("BAR5:");
for(i = 0; i <= 0x0F; i++)
- printk("%02X:%02X ", i, readb(barp + i));
+ printk("%02X:%02X ", i, ioread8(barp + i));
printk("\n");
- devices = readl(barp + 0x0C);
+ devices = ioread32(barp + 0x0C);
pci_iounmap(pdev, barp);
if ((pdev->device == 0x6145) && (ap->port_no == 0) &&