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>
This commit is contained in:

committed by
David S. Miller

parent
0c68ae2605
commit
e174961ca1
@@ -414,7 +414,6 @@ static int ray_config(struct pcmcia_device *link)
|
||||
memreq_t mem;
|
||||
struct net_device *dev = (struct net_device *)link->priv;
|
||||
ray_dev_t *local = netdev_priv(dev);
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
DEBUG(1, "ray_config(0x%p)\n", link);
|
||||
|
||||
@@ -485,8 +484,8 @@ static int ray_config(struct pcmcia_device *link)
|
||||
strcpy(local->node.dev_name, dev->name);
|
||||
link->dev_node = &local->node;
|
||||
|
||||
printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %s\n",
|
||||
dev->name, dev->irq, print_mac(mac, dev->dev_addr));
|
||||
printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %pM\n",
|
||||
dev->name, dev->irq, dev->dev_addr);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -2595,7 +2594,6 @@ static int ray_cs_proc_show(struct seq_file *m, void *v)
|
||||
UCHAR *p;
|
||||
struct freq_hop_element *pfh;
|
||||
UCHAR c[33];
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
link = this_device;
|
||||
if (!link)
|
||||
@@ -2623,8 +2621,7 @@ static int ray_cs_proc_show(struct seq_file *m, void *v)
|
||||
nettype[local->sparm.b5.a_network_type], c);
|
||||
|
||||
p = local->bss_id;
|
||||
seq_printf(m, "BSSID = %s\n",
|
||||
print_mac(mac, p));
|
||||
seq_printf(m, "BSSID = %pM\n", p);
|
||||
|
||||
seq_printf(m, "Country code = %d\n",
|
||||
local->sparm.b5.a_curr_country_code);
|
||||
|
Reference in New Issue
Block a user