diff options
| author | Al Viro | 2005-10-21 07:46:02 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-10-21 08:05:31 +0200 |
| commit | 1e4f2a96aeb373000ccd783e0f5b40294b5e668a (patch) | |
| tree | cdd94e8f5f49e6ac42391e71effe0b6a2892d507 | |
| parent | [PATCH] iomem annotations (sata_nv) (diff) | |
| download | kernel-qcow2-linux-1e4f2a96aeb373000ccd783e0f5b40294b5e668a.tar.gz kernel-qcow2-linux-1e4f2a96aeb373000ccd783e0f5b40294b5e668a.tar.xz kernel-qcow2-linux-1e4f2a96aeb373000ccd783e0f5b40294b5e668a.zip | |
[PATCH] iomem annotations (ahci)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| -rw-r--r-- | drivers/scsi/ahci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 5ec866b00479..cfa22e4ee547 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -407,7 +407,7 @@ static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in) return 0xffffffffU; } - return readl((void *) ap->ioaddr.scr_addr + (sc_reg * 4)); + return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); } @@ -425,7 +425,7 @@ static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg_in, return; } - writel(val, (void *) ap->ioaddr.scr_addr + (sc_reg * 4)); + writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); } static void ahci_phy_reset(struct ata_port *ap) @@ -453,14 +453,14 @@ static void ahci_phy_reset(struct ata_port *ap) static u8 ahci_check_status(struct ata_port *ap) { - void *mmio = (void *) ap->ioaddr.cmd_addr; + void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr; return readl(mmio + PORT_TFDATA) & 0xFF; } static u8 ahci_check_err(struct ata_port *ap) { - void *mmio = (void *) ap->ioaddr.cmd_addr; + void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr; return (readl(mmio + PORT_TFDATA) >> 8) & 0xFF; } |