diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/via-rhine.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
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 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index d55c4fdff489..9669bce0fd07 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -638,6 +638,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, | |||
638 | #else | 638 | #else |
639 | int bar = 0; | 639 | int bar = 0; |
640 | #endif | 640 | #endif |
641 | DECLARE_MAC_BUF(mac); | ||
641 | 642 | ||
642 | /* when built into the kernel, we only print version if device is found */ | 643 | /* when built into the kernel, we only print version if device is found */ |
643 | #ifndef MODULE | 644 | #ifndef MODULE |
@@ -794,18 +795,14 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, | |||
794 | if (rc) | 795 | if (rc) |
795 | goto err_out_unmap; | 796 | goto err_out_unmap; |
796 | 797 | ||
797 | printk(KERN_INFO "%s: VIA %s at 0x%lx, ", | 798 | printk(KERN_INFO "%s: VIA %s at 0x%lx, %s, IRQ %d.\n", |
798 | dev->name, name, | 799 | dev->name, name, |
799 | #ifdef USE_MMIO | 800 | #ifdef USE_MMIO |
800 | memaddr | 801 | memaddr, |
801 | #else | 802 | #else |
802 | (long)ioaddr | 803 | (long)ioaddr, |
803 | #endif | 804 | #endif |
804 | ); | 805 | print_mac(mac, dev->dev_addr), pdev->irq); |
805 | |||
806 | for (i = 0; i < 5; i++) | ||
807 | printk("%2.2x:", dev->dev_addr[i]); | ||
808 | printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], pdev->irq); | ||
809 | 806 | ||
810 | pci_set_drvdata(pdev, dev); | 807 | pci_set_drvdata(pdev, dev); |
811 | 808 | ||