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/sunhme.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/sunhme.c')
-rw-r--r-- | drivers/net/sunhme.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 170580c13127..120c8affe83d 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -2664,6 +2664,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe | |||
2664 | struct net_device *dev; | 2664 | struct net_device *dev; |
2665 | int i, qfe_slot = -1; | 2665 | int i, qfe_slot = -1; |
2666 | int err = -ENODEV; | 2666 | int err = -ENODEV; |
2667 | DECLARE_MAC_BUF(mac); | ||
2667 | 2668 | ||
2668 | if (is_qfe) { | 2669 | if (is_qfe) { |
2669 | qp = quattro_sbus_find(sdev); | 2670 | qp = quattro_sbus_find(sdev); |
@@ -2850,10 +2851,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe | |||
2850 | printk(KERN_INFO "%s: HAPPY MEAL (SBUS) 10/100baseT Ethernet ", | 2851 | printk(KERN_INFO "%s: HAPPY MEAL (SBUS) 10/100baseT Ethernet ", |
2851 | dev->name); | 2852 | dev->name); |
2852 | 2853 | ||
2853 | for (i = 0; i < 6; i++) | 2854 | printk("%s\n", print_mac(mac, dev->dev_addr)); |
2854 | printk("%2.2x%c", | ||
2855 | dev->dev_addr[i], i == 5 ? ' ' : ':'); | ||
2856 | printk("\n"); | ||
2857 | 2855 | ||
2858 | return 0; | 2856 | return 0; |
2859 | 2857 | ||
@@ -2988,6 +2986,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | |||
2988 | int i, qfe_slot = -1; | 2986 | int i, qfe_slot = -1; |
2989 | char prom_name[64]; | 2987 | char prom_name[64]; |
2990 | int err; | 2988 | int err; |
2989 | DECLARE_MAC_BUF(mac); | ||
2991 | 2990 | ||
2992 | /* Now make sure pci_dev cookie is there. */ | 2991 | /* Now make sure pci_dev cookie is there. */ |
2993 | #ifdef CONFIG_SPARC | 2992 | #ifdef CONFIG_SPARC |
@@ -3201,10 +3200,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | |||
3201 | printk(KERN_INFO "%s: HAPPY MEAL (PCI/CheerIO) 10/100BaseT Ethernet ", | 3200 | printk(KERN_INFO "%s: HAPPY MEAL (PCI/CheerIO) 10/100BaseT Ethernet ", |
3202 | dev->name); | 3201 | dev->name); |
3203 | 3202 | ||
3204 | for (i = 0; i < 6; i++) | 3203 | printk("%s\n", print_mac(mac, dev->dev_addr)); |
3205 | printk("%2.2x%c", dev->dev_addr[i], i == 5 ? ' ' : ':'); | ||
3206 | |||
3207 | printk("\n"); | ||
3208 | 3204 | ||
3209 | return 0; | 3205 | return 0; |
3210 | 3206 | ||