Commit d6645372 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

[TG3]: Use print_mac

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 137919a9
...@@ -12361,9 +12361,10 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, ...@@ -12361,9 +12361,10 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
unsigned long tg3reg_base, tg3reg_len; unsigned long tg3reg_base, tg3reg_len;
struct net_device *dev; struct net_device *dev;
struct tg3 *tp; struct tg3 *tp;
int i, err, pm_cap; int err, pm_cap;
char str[40]; char str[40];
u64 dma_mask, persist_dma_mask; u64 dma_mask, persist_dma_mask;
DECLARE_MAC_BUF(mac);
if (tg3_version_printed++ == 0) if (tg3_version_printed++ == 0)
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
...@@ -12642,7 +12643,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, ...@@ -12642,7 +12643,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
goto err_out_apeunmap; goto err_out_apeunmap;
} }
printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ", printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] "
"(%s) %s Ethernet %s\n",
dev->name, dev->name,
tp->board_part_number, tp->board_part_number,
tp->pci_chip_rev_id, tp->pci_chip_rev_id,
...@@ -12650,11 +12652,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, ...@@ -12650,11 +12652,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
tg3_bus_string(tp, str), tg3_bus_string(tp, str),
((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" :
((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" :
"10/100/1000Base-T"))); "10/100/1000Base-T")),
print_mac(mac, dev->dev_addr));
for (i = 0; i < 6; i++)
printk("%2.2x%c", dev->dev_addr[i],
i == 5 ? '\n' : ':');
printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] " printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] "
"MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n", "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment