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/macmace.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/macmace.c')
-rw-r--r-- | drivers/net/macmace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 85587a6667b9..0b28318789a3 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c | |||
@@ -194,7 +194,6 @@ static int __devinit mace_probe(struct platform_device *pdev) | |||
194 | unsigned char checksum = 0; | 194 | unsigned char checksum = 0; |
195 | static int found = 0; | 195 | static int found = 0; |
196 | int err; | 196 | int err; |
197 | DECLARE_MAC_BUF(mac); | ||
198 | 197 | ||
199 | if (found || macintosh_config->ether_type != MAC_ETHER_MACE) | 198 | if (found || macintosh_config->ether_type != MAC_ETHER_MACE) |
200 | return -ENODEV; | 199 | return -ENODEV; |
@@ -249,8 +248,8 @@ static int __devinit mace_probe(struct platform_device *pdev) | |||
249 | dev->set_multicast_list = mace_set_multicast; | 248 | dev->set_multicast_list = mace_set_multicast; |
250 | dev->set_mac_address = mace_set_address; | 249 | dev->set_mac_address = mace_set_address; |
251 | 250 | ||
252 | printk(KERN_INFO "%s: 68K MACE, hardware address %s\n", | 251 | printk(KERN_INFO "%s: 68K MACE, hardware address %pM\n", |
253 | dev->name, print_mac(mac, dev->dev_addr)); | 252 | dev->name, dev->dev_addr); |
254 | 253 | ||
255 | err = register_netdev(dev); | 254 | err = register_netdev(dev); |
256 | if (!err) | 255 | if (!err) |