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/fealnx.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/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index b455ae931f7a..61c7cbba88be 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -486,7 +486,6 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
486 | #else | 486 | #else |
487 | int bar = 1; | 487 | int bar = 1; |
488 | #endif | 488 | #endif |
489 | DECLARE_MAC_BUF(mac); | ||
490 | 489 | ||
491 | /* when built into the kernel, we only print version if device is found */ | 490 | /* when built into the kernel, we only print version if device is found */ |
492 | #ifndef MODULE | 491 | #ifndef MODULE |
@@ -665,9 +664,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
665 | if (err) | 664 | if (err) |
666 | goto err_out_free_tx; | 665 | goto err_out_free_tx; |
667 | 666 | ||
668 | printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n", | 667 | printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n", |
669 | dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr, | 668 | dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr, |
670 | print_mac(mac, dev->dev_addr), irq); | 669 | dev->dev_addr, irq); |
671 | 670 | ||
672 | return 0; | 671 | return 0; |
673 | 672 | ||