Commit 7c250413 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] pata_pdc2027x iomem annotations

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 355edd2e
...@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(pci, pdc2027x_pci_tbl); ...@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(pci, pdc2027x_pci_tbl);
* @ap: Port * @ap: Port
* @offset: offset from mmio base * @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; 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) ...@@ -253,7 +253,7 @@ static inline void* port_mmio(struct ata_port *ap, unsigned int offset)
* @adev: device * @adev: device
* @offset: offset from mmio base * @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; u8 adj = (adev->devno) ? 0x08 : 0x00;
return port_mmio(ap, offset) + adj; return port_mmio(ap, offset) + adj;
...@@ -758,7 +758,7 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_de ...@@ -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; struct ata_probe_ent *probe_ent = NULL;
unsigned long base; unsigned long base;
void *mmio_base; void __iomem *mmio_base;
int rc; int rc;
if (!printed_version++) if (!printed_version++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment