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
@@ -1034,12 +1034,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
|
||||
static void print_eth(unsigned char *add, char *str)
|
||||
{
|
||||
DECLARE_MAC_BUF(mac);
|
||||
DECLARE_MAC_BUF(mac2);
|
||||
|
||||
printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
|
||||
add, print_mac(mac, add + 6), print_mac(mac2, add),
|
||||
add[12], add[13], str);
|
||||
printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n",
|
||||
add, add + 6, add, add[12], add[13], str);
|
||||
}
|
||||
|
||||
static int __devinit i82596_probe(struct net_device *dev)
|
||||
@@ -1343,7 +1339,6 @@ static void set_multicast_list(struct net_device *dev)
|
||||
struct i596_private *lp = netdev_priv(dev);
|
||||
struct i596_dma *dma = lp->dma;
|
||||
int config = 0, cnt;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
DEB(DEB_MULTI,
|
||||
printk(KERN_DEBUG
|
||||
@@ -1407,8 +1402,8 @@ static void set_multicast_list(struct net_device *dev)
|
||||
if (i596_debug > 1)
|
||||
DEB(DEB_MULTI,
|
||||
printk(KERN_DEBUG
|
||||
"%s: Adding address %s\n",
|
||||
dev->name, print_mac(mac, cp)));
|
||||
"%s: Adding address %pM\n",
|
||||
dev->name, cp));
|
||||
}
|
||||
DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
|
||||
i596_add_cmd(dev, &cmd->cmd);
|
||||
|
Reference in New Issue
Block a user