aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/dmfe.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/tulip/dmfe.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/tulip/dmfe.c')
-rw-r--r--drivers/net/tulip/dmfe.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 8e46a513a252..194f1825718a 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -362,7 +362,6 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
362 struct net_device *dev; 362 struct net_device *dev;
363 u32 pci_pmr; 363 u32 pci_pmr;
364 int i, err; 364 int i, err;
365 DECLARE_MAC_BUF(mac);
366 365
367 DMFE_DBUG(0, "dmfe_init_one()", 0); 366 DMFE_DBUG(0, "dmfe_init_one()", 0);
368 367
@@ -471,12 +470,11 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
471 if (err) 470 if (err)
472 goto err_out_res; 471 goto err_out_res;
473 472
474 printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, " 473 printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n",
475 "%s, irq %d.\n",
476 dev->name, 474 dev->name,
477 ent->driver_data >> 16, 475 ent->driver_data >> 16,
478 pci_name(pdev), 476 pci_name(pdev),
479 print_mac(mac, dev->dev_addr), 477 dev->dev_addr,
480 dev->irq); 478 dev->irq);
481 479
482 pci_set_master(pdev); 480 pci_set_master(pdev);