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/sundance.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/sundance.c')
-rw-r--r-- | drivers/net/sundance.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index f860ea150395..8c6a8941a054 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -468,7 +468,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, | |||
468 | int bar = 1; | 468 | int bar = 1; |
469 | #endif | 469 | #endif |
470 | int phy, phy_end, phy_idx = 0; | 470 | int phy, phy_end, phy_idx = 0; |
471 | DECLARE_MAC_BUF(mac); | ||
472 | 471 | ||
473 | /* when built into the kernel, we only print version if device is found */ | 472 | /* when built into the kernel, we only print version if device is found */ |
474 | #ifndef MODULE | 473 | #ifndef MODULE |
@@ -547,9 +546,9 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, | |||
547 | if (i) | 546 | if (i) |
548 | goto err_out_unmap_rx; | 547 | goto err_out_unmap_rx; |
549 | 548 | ||
550 | printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n", | 549 | printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n", |
551 | dev->name, pci_id_tbl[chip_idx].name, ioaddr, | 550 | dev->name, pci_id_tbl[chip_idx].name, ioaddr, |
552 | print_mac(mac, dev->dev_addr), irq); | 551 | dev->dev_addr, irq); |
553 | 552 | ||
554 | np->phys[0] = 1; /* Default setting */ | 553 | np->phys[0] = 1; /* Default setting */ |
555 | np->mii_preamble_required++; | 554 | np->mii_preamble_required++; |