diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/ewrk3.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ewrk3.c')
-rw-r--r-- | drivers/net/ewrk3.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c index 593a120e31b2..3ab2156905f0 100644 --- a/drivers/net/ewrk3.c +++ b/drivers/net/ewrk3.c | |||
@@ -396,7 +396,6 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase) | |||
396 | u_long mem_start, shmem_length; | 396 | u_long mem_start, shmem_length; |
397 | u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0; | 397 | u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0; |
398 | u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0; | 398 | u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0; |
399 | DECLARE_MAC_BUF(mac); | ||
400 | 399 | ||
401 | /* | 400 | /* |
402 | ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot. | 401 | ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot. |
@@ -461,7 +460,7 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase) | |||
461 | if (lemac != LeMAC2) | 460 | if (lemac != LeMAC2) |
462 | DevicePresent(iobase); /* need after EWRK3_INIT */ | 461 | DevicePresent(iobase); /* need after EWRK3_INIT */ |
463 | status = get_hw_addr(dev, eeprom_image, lemac); | 462 | status = get_hw_addr(dev, eeprom_image, lemac); |
464 | printk("%s\n", print_mac(mac, dev->dev_addr)); | 463 | printk("%pM\n", dev->dev_addr); |
465 | 464 | ||
466 | if (status) { | 465 | if (status) { |
467 | printk(" which has an EEPROM CRC error.\n"); | 466 | printk(" which has an EEPROM CRC error.\n"); |
@@ -646,10 +645,8 @@ static int ewrk3_open(struct net_device *dev) | |||
646 | ewrk3_init(dev); | 645 | ewrk3_init(dev); |
647 | 646 | ||
648 | if (ewrk3_debug > 1) { | 647 | if (ewrk3_debug > 1) { |
649 | DECLARE_MAC_BUF(mac); | ||
650 | printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq); | 648 | printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq); |
651 | printk(" physical address: %s\n", | 649 | printk(" physical address: %pM\n", dev->dev_addr); |
652 | print_mac(mac, dev->dev_addr)); | ||
653 | if (lp->shmem_length == 0) { | 650 | if (lp->shmem_length == 0) { |
654 | printk(" no shared memory, I/O only mode\n"); | 651 | printk(" no shared memory, I/O only mode\n"); |
655 | } else { | 652 | } else { |