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/lance.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/lance.c')
-rw-r--r-- | drivers/net/lance.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index 977ed3401bb3..4ab536de24a8 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -466,7 +466,6 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int | |||
466 | unsigned long flags; | 466 | unsigned long flags; |
467 | int err = -ENOMEM; | 467 | int err = -ENOMEM; |
468 | void __iomem *bios; | 468 | void __iomem *bios; |
469 | DECLARE_MAC_BUF(mac); | ||
470 | 469 | ||
471 | /* First we look for special cases. | 470 | /* First we look for special cases. |
472 | Check for HP's on-board ethernet by looking for 'HP' in the BIOS. | 471 | Check for HP's on-board ethernet by looking for 'HP' in the BIOS. |
@@ -529,7 +528,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int | |||
529 | The first six bytes are the station address. */ | 528 | The first six bytes are the station address. */ |
530 | for (i = 0; i < 6; i++) | 529 | for (i = 0; i < 6; i++) |
531 | dev->dev_addr[i] = inb(ioaddr + i); | 530 | dev->dev_addr[i] = inb(ioaddr + i); |
532 | printk("%s", print_mac(mac, dev->dev_addr)); | 531 | printk("%pM", dev->dev_addr); |
533 | 532 | ||
534 | dev->base_addr = ioaddr; | 533 | dev->base_addr = ioaddr; |
535 | /* Make certain the data structures used by the LANCE are aligned and DMAble. */ | 534 | /* Make certain the data structures used by the LANCE are aligned and DMAble. */ |