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/ne2k-pci.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/ne2k-pci.c')
-rw-r--r-- | drivers/net/ne2k-pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index de0de744a8fa..12a7d6de1411 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
@@ -212,7 +212,6 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
212 | static unsigned int fnd_cnt; | 212 | static unsigned int fnd_cnt; |
213 | long ioaddr; | 213 | long ioaddr; |
214 | int flags = pci_clone_list[chip_idx].flags; | 214 | int flags = pci_clone_list[chip_idx].flags; |
215 | DECLARE_MAC_BUF(mac); | ||
216 | 215 | ||
217 | /* when built into the kernel, we only print version if device is found */ | 216 | /* when built into the kernel, we only print version if device is found */ |
218 | #ifndef MODULE | 217 | #ifndef MODULE |
@@ -368,9 +367,9 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
368 | 367 | ||
369 | for(i = 0; i < 6; i++) | 368 | for(i = 0; i < 6; i++) |
370 | dev->dev_addr[i] = SA_prom[i]; | 369 | dev->dev_addr[i] = SA_prom[i]; |
371 | printk("%s: %s found at %#lx, IRQ %d, %s.\n", | 370 | printk("%s: %s found at %#lx, IRQ %d, %pM.\n", |
372 | dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, | 371 | dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, |
373 | print_mac(mac, dev->dev_addr)); | 372 | dev->dev_addr); |
374 | 373 | ||
375 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | 374 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
376 | 375 | ||