aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commitf004690f1a9a4c5b67c10f0b1c32c1caaeed837d (patch)
treeff511aeef7ff8bffba7e866890a191f71fe0a3d0 /target/linux
parent975bfc4188a4c4f0aa141c0e08a8ee52392011a9 (diff)
downloadupstream-f004690f1a9a4c5b67c10f0b1c32c1caaeed837d.tar.gz
upstream-f004690f1a9a4c5b67c10f0b1c32c1caaeed837d.tar.bz2
upstream-f004690f1a9a4c5b67c10f0b1c32c1caaeed837d.zip
[mcs814x] more convertions to {read,write}_relaxed I/O accessors
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33604 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-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
-rw-r--r--target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c2
3 files changed, 7 insertions, 7 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);
diff --git a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
index d874e71a1b..fe95ea7f7d 100644
--- a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
+++ b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
@@ -117,7 +117,7 @@ static inline u32 nuport_mac_readl(void __iomem *reg)
static inline u8 nuport_mac_readb(void __iomem *reg)
{
- return __raw_readb(reg);
+ return readb_relaxed(reg);
}
static inline void nuport_mac_writel(u32 value, void __iomem *reg)