]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ata_piix: Invalid use of writel/readl with iomap
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Mon, 19 Nov 2007 14:28:28 +0000 (14:28 +0000)
committerJeff Garzik <jeff@garzik.org>
Sat, 24 Nov 2007 00:33:26 +0000 (19:33 -0500)
Should use ioread* as discussed previously

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/ata_piix.c

index 671e7966500946770e27c3efc4af5f91cd303cf5..483269db2c7d44037a4b7268470c6bae6574e831 100644 (file)
@@ -1121,12 +1121,12 @@ static int piix_disable_ahci(struct pci_dev *pdev)
        if (!mmio)
                return -ENOMEM;
 
-       tmp = readl(mmio + AHCI_GLOBAL_CTL);
+       tmp = ioread32(mmio + AHCI_GLOBAL_CTL);
        if (tmp & AHCI_ENABLE) {
                tmp &= ~AHCI_ENABLE;
-               writel(tmp, mmio + AHCI_GLOBAL_CTL);
+               iowrite32(tmp, mmio + AHCI_GLOBAL_CTL);
 
-               tmp = readl(mmio + AHCI_GLOBAL_CTL);
+               tmp = ioread32(mmio + AHCI_GLOBAL_CTL);
                if (tmp & AHCI_ENABLE)
                        rc = -EIO;
        }