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/tg3.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/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index eb9f8f3638e1..d0500db4f713 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -13252,7 +13252,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
13252 | int err, pm_cap; | 13252 | int err, pm_cap; |
13253 | char str[40]; | 13253 | char str[40]; |
13254 | u64 dma_mask, persist_dma_mask; | 13254 | u64 dma_mask, persist_dma_mask; |
13255 | DECLARE_MAC_BUF(mac); | ||
13256 | 13255 | ||
13257 | if (tg3_version_printed++ == 0) | 13256 | if (tg3_version_printed++ == 0) |
13258 | printk(KERN_INFO "%s", version); | 13257 | printk(KERN_INFO "%s", version); |
@@ -13536,7 +13535,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
13536 | } | 13535 | } |
13537 | 13536 | ||
13538 | printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] " | 13537 | printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] " |
13539 | "(%s) %s Ethernet %s\n", | 13538 | "(%s) %s Ethernet %pM\n", |
13540 | dev->name, | 13539 | dev->name, |
13541 | tp->board_part_number, | 13540 | tp->board_part_number, |
13542 | tp->pci_chip_rev_id, | 13541 | tp->pci_chip_rev_id, |
@@ -13545,7 +13544,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
13545 | ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : | 13544 | ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : |
13546 | ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : | 13545 | ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : |
13547 | "10/100/1000Base-T")), | 13546 | "10/100/1000Base-T")), |
13548 | print_mac(mac, dev->dev_addr)); | 13547 | dev->dev_addr); |
13549 | 13548 | ||
13550 | printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] " | 13549 | printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] " |
13551 | "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n", | 13550 | "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n", |