summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-25 02:57:57 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 20:07:49 -0700
commit7c250413e5b7c3dfae89354725b70c76d7621395 (patch)
tree474f5b888ba3c05b2b46b4f40e544d93ed471526
parent355edd2e396ef919d14a605fb4e45466ee2b64d1 (diff)
downloadlinux-3.10-7c250413e5b7c3dfae89354725b70c76d7621395.tar.gz
linux-3.10-7c250413e5b7c3dfae89354725b70c76d7621395.tar.bz2
linux-3.10-7c250413e5b7c3dfae89354725b70c76d7621395.zip
[PATCH] pata_pdc2027x iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ata/pata_pdc2027x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 56b8c1ee293..31ab9c88620 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(pci, pdc2027x_pci_tbl);
* @ap: Port
* @offset: offset from mmio base
*/
-static inline void* port_mmio(struct ata_port *ap, unsigned int offset)
+static inline void __iomem *port_mmio(struct ata_port *ap, unsigned int offset)
{
return ap->host->mmio_base + ap->port_no * 0x100 + offset;
}
@@ -253,7 +253,7 @@ static inline void* port_mmio(struct ata_port *ap, unsigned int offset)
* @adev: device
* @offset: offset from mmio base
*/
-static inline void* dev_mmio(struct ata_port *ap, struct ata_device *adev, unsigned int offset)
+static inline void __iomem *dev_mmio(struct ata_port *ap, struct ata_device *adev, unsigned int offset)
{
u8 adj = (adev->devno) ? 0x08 : 0x00;
return port_mmio(ap, offset) + adj;
@@ -758,7 +758,7 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_de
struct ata_probe_ent *probe_ent = NULL;
unsigned long base;
- void *mmio_base;
+ void __iomem *mmio_base;
int rc;
if (!printed_version++)