linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ahci: Invalid use of writel/readl with iomap
@ 2007-11-19 14:28 Alan Cox
  2007-11-24  0:35 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2007-11-19 14:28 UTC (permalink / raw)
  To: jeff, linux-ide, akpm

Should use ioread* as discussed previously

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.24-rc2-mm1/drivers/ata/ata_piix.c linux-2.6.24-rc2-mm1/drivers/ata/ata_piix.c
--- linux.vanilla-2.6.24-rc2-mm1/drivers/ata/ata_piix.c	2007-11-16 17:55:11.000000000 +0000
+++ linux-2.6.24-rc2-mm1/drivers/ata/ata_piix.c	2007-11-16 18:11:02.000000000 +0000
@@ -1086,12 +1086,12 @@
 	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;
 	}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ahci: Invalid use of writel/readl with iomap
  2007-11-19 14:28 [PATCH] ahci: Invalid use of writel/readl with iomap Alan Cox
@ 2007-11-24  0:35 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-11-24  0:35 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-ide, akpm

Alan Cox wrote:
> Should use ioread* as discussed previously
> 
> Signed-off-by: Alan Cox <alan@redhat.com>

applied to #upstream-fixes, after s/ahci/ata_piix/ in subject line



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-11-24  0:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-19 14:28 [PATCH] ahci: Invalid use of writel/readl with iomap Alan Cox
2007-11-24  0:35 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).