tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Staging: agnx: replace print_mac with %pM

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Alexander Beregalov and committed by
Greg Kroah-Hartman c2c5be8b 5e436d09

+7 -10
+4 -5
drivers/staging/agnx/debug.h
··· 312 312 { 313 313 u16 fctl; 314 314 int hdrlen; 315 - DECLARE_MAC_BUF(mac); 316 315 317 316 fctl = le16_to_cpu(hdr->frame_control); 318 317 switch (fctl & IEEE80211_FCTL_FTYPE) { ··· 374 375 printk("FC=0x%04x DUR=0x%04x", 375 376 fctl, le16_to_cpu(hdr->duration_id)); 376 377 if (hdrlen >= 10) 377 - printk(" A1=%s", print_mac(mac, hdr->addr1)); 378 + printk(" A1=%pM", hdr->addr1); 378 379 if (hdrlen >= 16) 379 - printk(" A2=%s", print_mac(mac, hdr->addr2)); 380 + printk(" A2=%pM", hdr->addr2); 380 381 if (hdrlen >= 24) 381 - printk(" A3=%s", print_mac(mac, hdr->addr3)); 382 + printk(" A3=%pM", hdr->addr3); 382 383 if (hdrlen >= 30) 383 - printk(" A4=%s", print_mac(mac, hdr->addr4)); 384 + printk(" A4=%pM", hdr->addr4); 384 385 printk("\n"); 385 386 } 386 387
+3 -5
drivers/staging/agnx/pci.c
··· 150 150 *((u32 *)(priv->mac_addr + 2)) = cpu_to_le32(reg); 151 151 152 152 if (!is_valid_ether_addr(priv->mac_addr)) { 153 - DECLARE_MAC_BUF(mbuf); 154 - printk(KERN_WARNING PFX "read mac %s\n", print_mac(mbuf, priv->mac_addr)); 153 + printk(KERN_WARNING PFX "read mac %pM\n", priv->mac_addr); 155 154 printk(KERN_WARNING PFX "Invalid hwaddr! Using random hwaddr\n"); 156 155 random_ether_addr(priv->mac_addr); 157 156 } ··· 455 456 struct ieee80211_hw *dev; 456 457 struct agnx_priv *priv; 457 458 int err; 458 - DECLARE_MAC_BUF(mac); 459 459 460 460 err = pci_enable_device(pdev); 461 461 if (err) { ··· 548 550 549 551 agnx_hw_reset(priv); 550 552 551 - dev_info(&pdev->dev, "%s: hwaddr %s, Rev 0x%02x\n", 553 + dev_info(&pdev->dev, "%s: hwaddr %pM, Rev 0x%02x\n", 552 554 wiphy_name(dev->wiphy), 553 - print_mac(mac, dev->wiphy->perm_addr), priv->revid); 555 + dev->wiphy->perm_addr, priv->revid); 554 556 return 0; 555 557 556 558 err_iounmap: