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/epic100.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/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 76118ddd1042..9e4b313100ad 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -322,7 +322,6 @@ static int __devinit epic_init_one (struct pci_dev *pdev, | |||
322 | int i, ret, option = 0, duplex = 0; | 322 | int i, ret, option = 0, duplex = 0; |
323 | void *ring_space; | 323 | void *ring_space; |
324 | dma_addr_t ring_dma; | 324 | dma_addr_t ring_dma; |
325 | DECLARE_MAC_BUF(mac); | ||
326 | 325 | ||
327 | /* when built into the kernel, we only print version if device is found */ | 326 | /* when built into the kernel, we only print version if device is found */ |
328 | #ifndef MODULE | 327 | #ifndef MODULE |
@@ -499,9 +498,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev, | |||
499 | if (ret < 0) | 498 | if (ret < 0) |
500 | goto err_out_unmap_rx; | 499 | goto err_out_unmap_rx; |
501 | 500 | ||
502 | printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n", | 501 | printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n", |
503 | dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq, | 502 | dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq, |
504 | print_mac(mac, dev->dev_addr)); | 503 | dev->dev_addr); |
505 | 504 | ||
506 | out: | 505 | out: |
507 | return ret; | 506 | return ret; |