Skip to content

Commit

Permalink
r6040: use MAC_RST bit definition with MCR1 read/writes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Jan 4, 2012
1 parent 4e16d6e commit 58dbc69
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/rdc/r6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
iowrite16(MAC_RST, ioaddr + MCR1);
while (limit--) {
cmd = ioread16(ioaddr + MCR1);
if (cmd & 0x1)
if (cmd & MAC_RST)
break;
}
/* Reset internal state machine */
Expand Down Expand Up @@ -453,7 +453,7 @@ static void r6040_down(struct net_device *dev)
iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */
while (limit--) {
cmd = ioread16(ioaddr + MCR1);
if (cmd & 0x1)
if (cmd & MAC_RST)
break;
}

Expand Down Expand Up @@ -735,7 +735,7 @@ static void r6040_mac_address(struct net_device *dev)
u16 *adrp;

/* 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(0, ioaddr + MAC_SM);
mdelay(5);
Expand Down

0 comments on commit 58dbc69

Please sign in to comment.