projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a2e1dce
)
more convertions to {read,write}_relaxed I/O accessors
author
Florian Fainelli
<florian@openwrt.org>
Wed, 3 Oct 2012 16:10:47 +0000
(16:10 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Wed, 3 Oct 2012 16:10:47 +0000
(16:10 +0000)
SVN-Revision: 33604
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
patch
|
blob
|
history
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
patch
|
blob
|
history
target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
patch
|
blob
|
history
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 b679c044298f9def118644ec6b2be587b7f81f11..68b0a0dd1fcaa33d52b395b61eb3edd3ef8a2407 100644
(file)
--- 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;
{
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;
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 = {
}
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 3606fe84e41c42b534ecd845656fd18ddee7b12f..9ac5c46d6b365bb3d67223b25de7713a9a8988c2 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:
if (addr != 0) {
switch (size) {
case 1:
- v =
__raw_readb
(addr);
+ v =
readb_relaxed
(addr);
break;
case 2:
addr &= ~1;
break;
case 2:
addr &= ~1;
- v =
__raw_readw
(addr);
+ v =
readw_relaxed
(addr);
break;
default:
addr &= ~3;
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:
if (addr != 0) {
switch (size) {
case 1:
-
__raw_writeb
((u8)val, addr);
+
writeb_relaxed
((u8)val, addr);
break;
case 2:
break;
case 2:
-
__raw_writew
((u16)val, addr);
+
writew_relaxed
((u16)val, addr);
break;
case 4:
writel_relaxed(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 d874e71a1be2ea864e01cd84c0a329687a8b5b79..fe95ea7f7d947557cc9bc27d4b585fa3c1697ee6 100644
(file)
--- 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)
{
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)
}
static inline void nuport_mac_writel(u32 value, void __iomem *reg)