lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: convert print_mac to %pM

Browse Source 
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:
Johannes Berg
2008-10-27 15:59:26 -07:00
committed by David S. Miller
parent 0c68ae2605
commit e174961ca1
235 changed files with 891 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/tc35815.c
View File

@ -865,7 +865,6 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
struct net_device *dev;
struct tc35815_local *lp;
int rc;
DECLARE_MAC_BUF(mac);
static int printed_version;
if (!printed_version++) {
@ -942,11 +941,11 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
goto err_out;
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
printk(KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
dev->name,
chip_info[ent->driver_data].name,
dev->base_addr,
print_mac(mac, dev->dev_addr),
dev->dev_addr,
dev->irq);
rc = tc_mii_init(dev);
@ -1288,12 +1287,9 @@ panic_queues(struct net_device *dev)
static void print_eth(const u8 *add)
{
DECLARE_MAC_BUF(mac);
printk(KERN_DEBUG "print_eth(%p)\n", add);
printk(KERN_DEBUG " %s =>", print_mac(mac, add + 6));
printk(KERN_CONT " %s : %02x%02x\n",
print_mac(mac, add), add[12], add[13]);
printk(KERN_DEBUG " %pM => %pM : %02x%02x\n",
add + 6, add, add[12], add[13]);
}
static int tc35815_tx_full(struct net_device *dev)
@ -2153,13 +2149,12 @@ static void tc35815_set_cam_entry(struct net_device *dev, int index, unsigned ch
int cam_index = index * 6;
u32 cam_data;
u32 saved_addr;
DECLARE_MAC_BUF(mac);
saved_addr = tc_readl(&tr->CAM_Adr);
if (netif_msg_hw(lp))
printk(KERN_DEBUG "%s: CAM %d: %s\n",
dev->name, index, print_mac(mac, addr));
printk(KERN_DEBUG "%s: CAM %d: %pM\n",
dev->name, index, addr);
if (index & 1) {
/* read modify write */
tc_writel(cam_index - 2, &tr->CAM_Adr);