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/rionet.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/rionet.c')
-rw-r--r-- | drivers/net/rionet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index 2b8fd68bc516..bd4f4ad5d360 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c | |||
@@ -435,7 +435,6 @@ static int rionet_setup_netdev(struct rio_mport *mport) | |||
435 | struct net_device *ndev = NULL; | 435 | struct net_device *ndev = NULL; |
436 | struct rionet_private *rnet; | 436 | struct rionet_private *rnet; |
437 | u16 device_id; | 437 | u16 device_id; |
438 | DECLARE_MAC_BUF(mac); | ||
439 | 438 | ||
440 | /* Allocate our net_device structure */ | 439 | /* Allocate our net_device structure */ |
441 | ndev = alloc_etherdev(sizeof(struct rionet_private)); | 440 | ndev = alloc_etherdev(sizeof(struct rionet_private)); |
@@ -485,12 +484,12 @@ static int rionet_setup_netdev(struct rio_mport *mport) | |||
485 | if (rc != 0) | 484 | if (rc != 0) |
486 | goto out; | 485 | goto out; |
487 | 486 | ||
488 | printk("%s: %s %s Version %s, MAC %s\n", | 487 | printk("%s: %s %s Version %s, MAC %pM\n", |
489 | ndev->name, | 488 | ndev->name, |
490 | DRV_NAME, | 489 | DRV_NAME, |
491 | DRV_DESC, | 490 | DRV_DESC, |
492 | DRV_VERSION, | 491 | DRV_VERSION, |
493 | print_mac(mac, ndev->dev_addr)); | 492 | ndev->dev_addr); |
494 | 493 | ||
495 | out: | 494 | out: |
496 | return rc; | 495 | return rc; |