aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/bnx2.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/bnx2.c')
-rw-r--r--drivers/net/bnx2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 430d430bce29..f2e8c3b3ee04 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7700,7 +7700,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
7700 struct bnx2 *bp; 7700 struct bnx2 *bp;
7701 int rc; 7701 int rc;
7702 char str[40]; 7702 char str[40];
7703 DECLARE_MAC_BUF(mac);
7704 7703
7705 if (version_printed++ == 0) 7704 if (version_printed++ == 0)
7706 printk(KERN_INFO "%s", version); 7705 printk(KERN_INFO "%s", version);
@@ -7767,14 +7766,14 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
7767 } 7766 }
7768 7767
7769 printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, " 7768 printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "
7770 "IRQ %d, node addr %s\n", 7769 "IRQ %d, node addr %pM\n",
7771 dev->name, 7770 dev->name,
7772 board_info[ent->driver_data].name, 7771 board_info[ent->driver_data].name,
7773 ((CHIP_ID(bp) & 0xf000) >> 12) + 'A', 7772 ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
7774 ((CHIP_ID(bp) & 0x0ff0) >> 4), 7773 ((CHIP_ID(bp) & 0x0ff0) >> 4),
7775 bnx2_bus_string(bp, str), 7774 bnx2_bus_string(bp, str),
7776 dev->base_addr, 7775 dev->base_addr,
7777 bp->pdev->irq, print_mac(mac, dev->dev_addr)); 7776 bp->pdev->irq, dev->dev_addr);
7778 7777
7779 return 0; 7778 return 0;
7780} 7779}