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/bnx2x_main.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/bnx2x_main.c')
-rw-r--r-- | drivers/net/bnx2x_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index fce745148ff9..b55257f31c71 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
@@ -10192,7 +10192,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, | |||
10192 | struct net_device *dev = NULL; | 10192 | struct net_device *dev = NULL; |
10193 | struct bnx2x *bp; | 10193 | struct bnx2x *bp; |
10194 | int rc; | 10194 | int rc; |
10195 | DECLARE_MAC_BUF(mac); | ||
10196 | 10195 | ||
10197 | if (version_printed++ == 0) | 10196 | if (version_printed++ == 0) |
10198 | printk(KERN_INFO "%s", version); | 10197 | printk(KERN_INFO "%s", version); |
@@ -10236,7 +10235,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, | |||
10236 | bnx2x_get_pcie_width(bp), | 10235 | bnx2x_get_pcie_width(bp), |
10237 | (bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz", | 10236 | (bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz", |
10238 | dev->base_addr, bp->pdev->irq); | 10237 | dev->base_addr, bp->pdev->irq); |
10239 | printk(KERN_CONT "node addr %s\n", print_mac(mac, dev->dev_addr)); | 10238 | printk(KERN_CONT "node addr %pM\n", dev->dev_addr); |
10240 | return 0; | 10239 | return 0; |
10241 | 10240 | ||
10242 | init_one_exit: | 10241 | init_one_exit: |