diff options
| author | Al Viro | 2005-10-21 07:46:02 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-10-21 08:05:31 +0200 |
| commit | 9ee0c0a2ccd66b90eaeb2f197c0a7da43071af52 (patch) | |
| tree | f6c1cb2d94b819a685687bc83110123023d1f099 | |
| parent | [PATCH] libata: Marvell endian fix (diff) | |
| download | kernel-qcow2-linux-9ee0c0a2ccd66b90eaeb2f197c0a7da43071af52.tar.gz kernel-qcow2-linux-9ee0c0a2ccd66b90eaeb2f197c0a7da43071af52.tar.xz kernel-qcow2-linux-9ee0c0a2ccd66b90eaeb2f197c0a7da43071af52.zip | |
[PATCH] iomem annotations (sata_nv)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| -rw-r--r-- | drivers/scsi/sata_nv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 9fa2535dd937..8866530bc491 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c @@ -331,7 +331,7 @@ static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg) return 0xffffffffU; if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO) - return readl((void*)ap->ioaddr.scr_addr + (sc_reg * 4)); + return readl((void __iomem *)ap->ioaddr.scr_addr + (sc_reg * 4)); else return inl(ap->ioaddr.scr_addr + (sc_reg * 4)); } @@ -345,7 +345,7 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) return; if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO) - writel(val, (void*)ap->ioaddr.scr_addr + (sc_reg * 4)); + writel(val, (void __iomem *)ap->ioaddr.scr_addr + (sc_reg * 4)); else outl(val, ap->ioaddr.scr_addr + (sc_reg * 4)); } |