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/tulip/uli526x.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/tulip/uli526x.c')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index e9e628621639..298649a236cb 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -261,7 +261,6 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev, | |||
261 | struct uli526x_board_info *db; /* board information structure */ | 261 | struct uli526x_board_info *db; /* board information structure */ |
262 | struct net_device *dev; | 262 | struct net_device *dev; |
263 | int i, err; | 263 | int i, err; |
264 | DECLARE_MAC_BUF(mac); | ||
265 | 264 | ||
266 | ULI526X_DBUG(0, "uli526x_init_one()", 0); | 265 | ULI526X_DBUG(0, "uli526x_init_one()", 0); |
267 | 266 | ||
@@ -379,9 +378,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev, | |||
379 | if (err) | 378 | if (err) |
380 | goto err_out_res; | 379 | goto err_out_res; |
381 | 380 | ||
382 | printk(KERN_INFO "%s: ULi M%04lx at pci%s, %s, irq %d.\n", | 381 | printk(KERN_INFO "%s: ULi M%04lx at pci%s, %pM, irq %d.\n", |
383 | dev->name,ent->driver_data >> 16,pci_name(pdev), | 382 | dev->name,ent->driver_data >> 16,pci_name(pdev), |
384 | print_mac(mac, dev->dev_addr), dev->irq); | 383 | dev->dev_addr, dev->irq); |
385 | 384 | ||
386 | pci_set_master(pdev); | 385 | pci_set_master(pdev); |
387 | 386 | ||