aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-03 16:10:47 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-03 16:10:47 +0000
commitd504b6251ce462dfb8dba1c4902bb421d4bae255 (patch)
treead418c9b08e42cdb776701c9dcf45154dc492292 /target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x
parenta2e1dce829784647b5bc635337b1ad92c9eb64ea (diff)
downloadupstream-d504b6251ce462dfb8dba1c4902bb421d4bae255.tar.gz
upstream-d504b6251ce462dfb8dba1c4902bb421d4bae255.tar.bz2
upstream-d504b6251ce462dfb8dba1c4902bb421d4bae255.zip
more convertions to {read,write}_relaxed I/O accessors
SVN-Revision: 33604
Diffstat (limited to 'target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x')
-rw-r--r--target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c4
-rw-r--r--target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
index b679c04429..68b0a0dd1f 100644
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
@@ -89,12 +89,12 @@ static void mcs814x_eth_buffer_shifting_set(u8 value)
{
u8 reg;
- reg = __raw_readb(mcs814x_sysdbg_base + SYSDBG_SYSCTL_MAC);
+ reg = readb_relaxed(mcs814x_sysdbg_base + SYSDBG_SYSCTL_MAC);
if (value)
reg |= BUF_SHIFT_BIT;
else
reg &= ~BUF_SHIFT_BIT;
- __raw_writeb(reg, mcs814x_sysdbg_base + SYSDBG_SYSCTL_MAC);
+ writeb_relaxed(reg, mcs814x_sysdbg_base + SYSDBG_SYSCTL_MAC);
}
static struct of_device_id mcs814x_eth_ids[] __initdata = {
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 3606fe84e4..9ac5c46d6b 100644
--- 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);