aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-24 21:57:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 23:07:49 -0400
commit7c250413e5b7c3dfae89354725b70c76d7621395 (patch)
tree474f5b888ba3c05b2b46b4f40e544d93ed471526 /drivers/ata
parent355edd2e396ef919d14a605fb4e45466ee2b64d1 (diff)
[PATCH] pata_pdc2027x iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ata')
-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 56b8c1ee2937..31ab9c886209 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(pci, pdc2027x_pci_tbl);
242 * @ap: Port 242 * @ap: Port
243 * @offset: offset from mmio base 243 * @offset: offset from mmio base
244 */ 244 */
245static inline void* port_mmio(struct ata_port *ap, unsigned int offset) 245static inline void __iomem *port_mmio(struct ata_port *ap, unsigned int offset)
246{ 246{
247 return ap->host->mmio_base + ap->port_no * 0x100 + offset; 247 return ap->host->mmio_base + ap->port_no * 0x100 + offset;
248} 248}
@@ -253,7 +253,7 @@ static inline void* port_mmio(struct ata_port *ap, unsigned int offset)
253 * @adev: device 253 * @adev: device
254 * @offset: offset from mmio base 254 * @offset: offset from mmio base
255 */ 255 */
256static inline void* dev_mmio(struct ata_port *ap, struct ata_device *adev, unsigned int offset) 256static inline void __iomem *dev_mmio(struct ata_port *ap, struct ata_device *adev, unsigned int offset)
257{ 257{
258 u8 adj = (adev->devno) ? 0x08 : 0x00; 258 u8 adj = (adev->devno) ? 0x08 : 0x00;
259 return port_mmio(ap, offset) + adj; 259 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 758
759 struct ata_probe_ent *probe_ent = NULL; 759 struct ata_probe_ent *probe_ent = NULL;
760 unsigned long base; 760 unsigned long base;
761 void *mmio_base; 761 void __iomem *mmio_base;
762 int rc; 762 int rc;
763 763
764 if (!printed_version++) 764 if (!printed_version++)