lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r6040: use MAC_RST bit definition with MCR1 read/writes

Browse Source 
MAC_RST bit is already defined, use it instead of 0x1 where applicable.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli
2012-01-04 08:59:35 +00:00
committed by David S. Miller
parent 4e16d6ebd6
commit 58dbc691e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/rdc/r6040.c
View File

@@ -371,7 +371,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
iowrite16(MAC_RST, ioaddr + MCR1); iowrite16(MAC_RST, ioaddr + MCR1);
while (limit--) { while (limit--) {
cmd = ioread16(ioaddr + MCR1); cmd = ioread16(ioaddr + MCR1);
if (cmd & 0x1) if (cmd & MAC_RST)
break; break;
} }
/* Reset internal state machine */ /* Reset internal state machine */
@@ -453,7 +453,7 @@ static void r6040_down(struct net_device *dev)
iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */ iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */
while (limit--) { while (limit--) {
cmd = ioread16(ioaddr + MCR1); cmd = ioread16(ioaddr + MCR1);
if (cmd & 0x1) if (cmd & MAC_RST)
break; break;
} }
@@ -735,7 +735,7 @@ static void r6040_mac_address(struct net_device *dev)
u16 *adrp; u16 *adrp;
/* MAC operation register */ /* MAC operation register */
iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */
iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */
iowrite16(0, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM);
mdelay(5); mdelay(5);