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
@ -521,7 +521,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
|
||||
unsigned rev_type = 0;
|
||||
int eeprom_buff[CHKSUM_LEN];
|
||||
int retval;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
/* Initialize the device structure. */
|
||||
if (!modular) {
|
||||
@ -846,7 +845,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
|
||||
}
|
||||
|
||||
/* print the ethernet address. */
|
||||
printk(", MAC %s", print_mac(mac, dev->dev_addr));
|
||||
printk(", MAC %pM", dev->dev_addr);
|
||||
|
||||
dev->open = net_open;
|
||||
dev->stop = net_close;
|
||||
@ -1817,11 +1816,10 @@ static int set_mac_address(struct net_device *dev, void *p)
|
||||
|
||||
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
|
||||
|
||||
if (net_debug) {
|
||||
DECLARE_MAC_BUF(mac);
|
||||
printk("%s: Setting MAC address to %s.\n",
|
||||
dev->name, print_mac(mac, dev->dev_addr));
|
||||
}
|
||||
if (net_debug)
|
||||
printk("%s: Setting MAC address to %pM.\n",
|
||||
dev->name, dev->dev_addr);
|
||||
|
||||
/* set the Ethernet address */
|
||||
for (i=0; i < ETH_ALEN/2; i++)
|
||||
writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));
|
||||
|
Reference in New Issue
Block a user