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
@@ -653,7 +653,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
|
||||
void __iomem *base;
|
||||
int drv_flags, io_size;
|
||||
int boguscnt;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
/* when built into the kernel, we only print version if device is found */
|
||||
#ifndef MODULE
|
||||
@@ -823,9 +822,9 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
|
||||
if (register_netdev(dev))
|
||||
goto err_out_cleardev;
|
||||
|
||||
printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
|
||||
printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
|
||||
dev->name, netdrv_tbl[chip_idx].name, base,
|
||||
print_mac(mac, dev->dev_addr), irq);
|
||||
dev->dev_addr, irq);
|
||||
|
||||
if (drv_flags & CanHaveMII) {
|
||||
int phy, phy_idx = 0;
|
||||
@@ -1452,12 +1451,8 @@ static int __netdev_rx(struct net_device *dev, int *quota)
|
||||
#ifndef final_version /* Remove after testing. */
|
||||
/* You will want this info for the initial debug. */
|
||||
if (debug > 5) {
|
||||
printk(KERN_DEBUG " Rx data " MAC_FMT " " MAC_FMT
|
||||
" %2.2x%2.2x.\n",
|
||||
skb->data[0], skb->data[1], skb->data[2],
|
||||
skb->data[3], skb->data[4], skb->data[5],
|
||||
skb->data[6], skb->data[7], skb->data[8],
|
||||
skb->data[9], skb->data[10], skb->data[11],
|
||||
printk(KERN_DEBUG " Rx data %pM %pM %2.2x%2.2x.\n",
|
||||
skb->data, skb->data + 6,
|
||||
skb->data[12], skb->data[13]);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user