aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/bnx2.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/bnx2.c')
-rw-r--r--drivers/net/bnx2.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5ee805b3e0e6..ee9aed3aa489 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6821,8 +6821,9 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
6821 static int version_printed = 0; 6821 static int version_printed = 0;
6822 struct net_device *dev = NULL; 6822 struct net_device *dev = NULL;
6823 struct bnx2 *bp; 6823 struct bnx2 *bp;
6824 int rc, i; 6824 int rc;
6825 char str[40]; 6825 char str[40];
6826 DECLARE_MAC_BUF(mac);
6826 6827
6827 if (version_printed++ == 0) 6828 if (version_printed++ == 0)
6828 printk(KERN_INFO "%s", version); 6829 printk(KERN_INFO "%s", version);
@@ -6890,19 +6891,14 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
6890 } 6891 }
6891 6892
6892 printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, " 6893 printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "
6893 "IRQ %d, ", 6894 "IRQ %d, node addr %s\n",
6894 dev->name, 6895 dev->name,
6895 bp->name, 6896 bp->name,
6896 ((CHIP_ID(bp) & 0xf000) >> 12) + 'A', 6897 ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
6897 ((CHIP_ID(bp) & 0x0ff0) >> 4), 6898 ((CHIP_ID(bp) & 0x0ff0) >> 4),
6898 bnx2_bus_string(bp, str), 6899 bnx2_bus_string(bp, str),
6899 dev->base_addr, 6900 dev->base_addr,
6900 bp->pdev->irq); 6901 bp->pdev->irq, print_mac(mac, dev->dev_addr));
6901
6902 printk("node addr ");
6903 for (i = 0; i < 6; i++)
6904 printk("%2.2x", dev->dev_addr[i]);
6905 printk("\n");
6906 6902
6907 return 0; 6903 return 0;
6908} 6904}