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/de620.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/de620.c')
-rw-r--r-- | drivers/net/de620.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index d454e143483e..254bb4adb6b7 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
@@ -800,7 +800,6 @@ struct net_device * __init de620_probe(int unit) | |||
800 | struct net_device *dev; | 800 | struct net_device *dev; |
801 | int err = -ENOMEM; | 801 | int err = -ENOMEM; |
802 | int i; | 802 | int i; |
803 | DECLARE_MAC_BUF(mac); | ||
804 | 803 | ||
805 | dev = alloc_etherdev(0); | 804 | dev = alloc_etherdev(0); |
806 | if (!dev) | 805 | if (!dev) |
@@ -853,7 +852,7 @@ struct net_device * __init de620_probe(int unit) | |||
853 | dev->broadcast[i] = 0xff; | 852 | dev->broadcast[i] = 0xff; |
854 | } | 853 | } |
855 | 854 | ||
856 | printk(", Ethernet Address: %s", print_mac(mac, dev->dev_addr)); | 855 | printk(", Ethernet Address: %pM", dev->dev_addr); |
857 | 856 | ||
858 | printk(" (%dk RAM,", | 857 | printk(" (%dk RAM,", |
859 | (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64); | 858 | (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64); |