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/arm/ether1.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/arm/ether1.c')
-rw-r--r-- | drivers/net/arm/ether1.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c index 3bb9e293e2ef..e380de454463 100644 --- a/drivers/net/arm/ether1.c +++ b/drivers/net/arm/ether1.c | |||
@@ -996,7 +996,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
996 | { | 996 | { |
997 | struct net_device *dev; | 997 | struct net_device *dev; |
998 | int i, ret = 0; | 998 | int i, ret = 0; |
999 | DECLARE_MAC_BUF(mac); | ||
1000 | 999 | ||
1001 | ether1_banner(); | 1000 | ether1_banner(); |
1002 | 1001 | ||
@@ -1044,8 +1043,8 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
1044 | if (ret) | 1043 | if (ret) |
1045 | goto free; | 1044 | goto free; |
1046 | 1045 | ||
1047 | printk(KERN_INFO "%s: ether1 in slot %d, %s\n", | 1046 | printk(KERN_INFO "%s: ether1 in slot %d, %pM\n", |
1048 | dev->name, ec->slot_no, print_mac(mac, dev->dev_addr)); | 1047 | dev->name, ec->slot_no, dev->dev_addr); |
1049 | 1048 | ||
1050 | ecard_set_drvdata(ec, dev); | 1049 | ecard_set_drvdata(ec, dev); |
1051 | return 0; | 1050 | return 0; |