lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SSB]: Use ioreadX() and iowriteX() for PCI.

Browse Source 
On a PCI bus use ioreadX() and iowriteX().
We map the I/O space with pci_iomap(), so we must use the correct
accessor functions, too.
readX() and writeX() are not guaranteed to accept the cookie returned
from pci_iomap() (though, it currently works on most architectures).

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Buesch
2007-09-19 18:53:44 +02:00
committed by David S. Miller
parent b85b3b7af5
commit 4b402c65a3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ssb/pci.c
View File

@@ -531,7 +531,7 @@ static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset)
if (unlikely(ssb_pci_switch_core(bus, dev))) if (unlikely(ssb_pci_switch_core(bus, dev)))
return 0xFFFF; return 0xFFFF;
} }
return readw(bus->mmio + offset); return ioread16(bus->mmio + offset);
} }
static u32 ssb_pci_read32(struct ssb_device *dev, u16 offset) static u32 ssb_pci_read32(struct ssb_device *dev, u16 offset)
@@ -544,7 +544,7 @@ static u32 ssb_pci_read32(struct ssb_device *dev, u16 offset)
if (unlikely(ssb_pci_switch_core(bus, dev))) if (unlikely(ssb_pci_switch_core(bus, dev)))
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
return readl(bus->mmio + offset); return ioread32(bus->mmio + offset);
} }
static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value) static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
@@ -557,7 +557,7 @@ static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
if (unlikely(ssb_pci_switch_core(bus, dev))) if (unlikely(ssb_pci_switch_core(bus, dev)))
return; return;
} }
writew(value, bus->mmio + offset); iowrite16(value, bus->mmio + offset);
} }
static void ssb_pci_write32(struct ssb_device *dev, u16 offset, u32 value) static void ssb_pci_write32(struct ssb_device *dev, u16 offset, u32 value)
@@ -570,7 +570,7 @@ static void ssb_pci_write32(struct ssb_device *dev, u16 offset, u32 value)
if (unlikely(ssb_pci_switch_core(bus, dev))) if (unlikely(ssb_pci_switch_core(bus, dev)))
return; return;
} }
writel(value, bus->mmio + offset); iowrite32(value, bus->mmio + offset);
} }
/* Not "static", as it's used in main.c */ /* Not "static", as it's used in main.c */