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/via-rhine.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/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 5b7870080c5..bb54a936a80 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -631,7 +631,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, | |||
631 | #else | 631 | #else |
632 | int bar = 0; | 632 | int bar = 0; |
633 | #endif | 633 | #endif |
634 | DECLARE_MAC_BUF(mac); | ||
635 | 634 | ||
636 | /* when built into the kernel, we only print version if device is found */ | 635 | /* when built into the kernel, we only print version if device is found */ |
637 | #ifndef MODULE | 636 | #ifndef MODULE |
@@ -787,14 +786,14 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, | |||
787 | if (rc) | 786 | if (rc) |
788 | goto err_out_unmap; | 787 | goto err_out_unmap; |
789 | 788 | ||
790 | printk(KERN_INFO "%s: VIA %s at 0x%lx, %s, IRQ %d.\n", | 789 | printk(KERN_INFO "%s: VIA %s at 0x%lx, %pM, IRQ %d.\n", |
791 | dev->name, name, | 790 | dev->name, name, |
792 | #ifdef USE_MMIO | 791 | #ifdef USE_MMIO |
793 | memaddr, | 792 | memaddr, |
794 | #else | 793 | #else |
795 | (long)ioaddr, | 794 | (long)ioaddr, |
796 | #endif | 795 | #endif |
797 | print_mac(mac, dev->dev_addr), pdev->irq); | 796 | dev->dev_addr, pdev->irq); |
798 | 797 | ||
799 | pci_set_drvdata(pdev, dev); | 798 | pci_set_drvdata(pdev, dev); |
800 | 799 | ||