more convertions to {read,write}_relaxed I/O accessors
SVN-Revision: 33604
This commit is contained in:
parent
a2e1dce829
commit
d504b6251c
3 changed files with 7 additions and 7 deletions
|
@ -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 = {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue