[mcs814x] more convertions to {read,write}_relaxed I/O accessors

[openwrt.git] / target / linux / mcs814x / files-3.3 / arch / arm / mach-mcs814x / pci.c

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
index 3606fe8..9ac5c46 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
@@ -116,11 +116,11 @@ static int mcs8140_pci_read_config(struct pci_bus *bus,
        if (addr != 0) {
                switch (size) {
                case 1:
-                       v = __raw_readb(addr);
+                       v = readb_relaxed(addr);
                        break;
                case 2:
                        addr &= ~1;
-                       v = __raw_readw(addr);
+                       v = readw_relaxed(addr);
                        break;
                default:
                        addr &= ~3;
@@ -155,10 +155,10 @@ static int mcs8140_pci_write_config(struct pci_bus *bus,
        if (addr != 0) {
                switch (size) {
                case 1:
-                       __raw_writeb((u8)val, addr);
+                       writeb_relaxed((u8)val, addr);
                        break;
                case 2:
-                       __raw_writew((u16)val, addr);
+                       writew_relaxed((u16)val, addr);
                        break;
                case 4:
                        writel_relaxed(val, addr);