agnx: replace print_mac with %pM
PATCH 1/1 agnx: replace print_mac with %pM
Signed-off-by Alexander Beregalov <[email protected]>
---
drivers/staging/agnx/debug.h | 9 ++++----- drivers/staging/agnx/pci.c | 8 +++----- 2 files changed, 7 insertions(+), 10 deletions(-)
drivers/staging/agnx/debug.h +4 -5
@@ -312,7 +312,6 @@ static inline void dump_ieee80211_hdr(struct ieee80211_hdr *hdr, char *tag) {u16 fctl;int hdrlen; -DECLARE_MAC_BUF (mac); fctl =le16_to_cpu (hdr->frame_control);switch (fctl &IEEE80211_FCTL_FTYPE ) {
@@ -375,13 +374,13 @@ static inline void dump_ieee80211_hdr(struct ieee80211_hdr *hdr, char *tag)printk ("FC=0x%04x DUR=0x%04x" , fctl,le16_to_cpu (hdr->duration_id));if (hdrlen >=10 ) -printk (" A1=%s" ,print_mac (mac, hdr->addr1)); +printk (" A1=%pM" , hdr->addr1);if (hdrlen >=16 ) -printk (" A2=%s" ,print_mac (mac, hdr->addr2)); +printk (" A2=%pM" , hdr->addr2);if (hdrlen >=24 ) -printk (" A3=%s" ,print_mac (mac, hdr->addr3)); +printk (" A3=%pM" , hdr->addr3);if (hdrlen >=30 ) -printk (" A4=%s" ,print_mac (mac, hdr->addr4)); +printk (" A4=%pM" , hdr->addr4);printk ("\n" ); }
drivers/staging/agnx/pci.c +3 -5
@@ -150,8 +150,7 @@ static int agnx_get_mac_address(struct agnx_priv *priv) *((u32 *)(priv->mac_addr +2 )) =cpu_to_le32 (reg);if (!is_valid_ether_addr (priv->mac_addr)) { -DECLARE_MAC_BUF (mbuf); - printk(KERN_WARNING PFX "read mac %s\n", print_mac(mbuf, priv->mac_addr)); + printk(KERN_WARNING PFX "read mac %pM\n", priv->mac_addr); printk(KERN_WARNING PFX "Invalid hwaddr! Using random hwaddr\n");random_ether_addr (priv->mac_addr); }
@@ -455,7 +454,6 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,u32 mem_addr0, mem_len0;u32 mem_addr1, mem_len1;int err; -DECLARE_MAC_BUF (mac); err =pci_enable_device (pdev);if (err) {
@@ -559,8 +557,8 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,agnx_hw_reset (priv); -printk (PFX "%s: hwaddr %s, Rev 0x%02x\n" ,wiphy_name (dev->wiphy), -print_mac (mac, dev->wiphy->perm_addr), priv->revid); +printk (PFX "%s: hwaddr %pM, Rev 0x%02x\n" ,wiphy_name (dev->wiphy), + dev->wiphy->perm_addr, priv->revid);return 0 ; err_iounmap:
2009/4/11 Alexander Beregalov <[email protected]>:
Quoted 4 lines
Signed-off-by Alexander Beregalov <[email protected]>---
Sorry, Subject should be
[PATCH 1/2] Staging: agnx: replace print_mac with %pM