diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-01-04 03:59:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-04 15:55:53 -0500 |
commit | 58dbc691e6ca6689402424db60f4a54745a38c67 (patch) | |
tree | 52410c5e5b909ed219a0c47f53c99bd9222c962e /drivers/net/ethernet/rdc/r6040.c | |
parent | 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c (diff) |
r6040: use MAC_RST bit definition with MCR1 read/writes
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>
Diffstat (limited to 'drivers/net/ethernet/rdc/r6040.c')
-rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index f4dddceecb04..4665a3932b98 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c | |||
@@ -371,7 +371,7 @@ static void r6040_init_mac_regs(struct net_device *dev) | |||
371 | iowrite16(MAC_RST, ioaddr + MCR1); | 371 | iowrite16(MAC_RST, ioaddr + MCR1); |
372 | while (limit--) { | 372 | while (limit--) { |
373 | cmd = ioread16(ioaddr + MCR1); | 373 | cmd = ioread16(ioaddr + MCR1); |
374 | if (cmd & 0x1) | 374 | if (cmd & MAC_RST) |
375 | break; | 375 | break; |
376 | } | 376 | } |
377 | /* Reset internal state machine */ | 377 | /* Reset internal state machine */ |
@@ -453,7 +453,7 @@ static void r6040_down(struct net_device *dev) | |||
453 | iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */ | 453 | iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */ |
454 | while (limit--) { | 454 | while (limit--) { |
455 | cmd = ioread16(ioaddr + MCR1); | 455 | cmd = ioread16(ioaddr + MCR1); |
456 | if (cmd & 0x1) | 456 | if (cmd & MAC_RST) |
457 | break; | 457 | break; |
458 | } | 458 | } |
459 | 459 | ||
@@ -735,7 +735,7 @@ static void r6040_mac_address(struct net_device *dev) | |||
735 | u16 *adrp; | 735 | u16 *adrp; |
736 | 736 | ||
737 | /* MAC operation register */ | 737 | /* MAC operation register */ |
738 | iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ | 738 | iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */ |
739 | iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ | 739 | iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ |
740 | iowrite16(0, ioaddr + MAC_SM); | 740 | iowrite16(0, ioaddr + MAC_SM); |
741 | mdelay(5); | 741 | mdelay(5); |