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>

8 files changed, 66 insertions, 120 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 6fc5e7361f26..bb91353c443e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -649,7 +649,6 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         u16 fc, rate_mask;
         struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_r;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_RATE("enter\n");
 
@@ -675,8 +674,8 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,
                 u8 sta_id = iwl3945_hw_find_station(priv, hdr->addr1);
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                       print_mac(mac, hdr->addr1));
+                        IWL_DEBUG_RATE("LQ: ADD station %pm\n",
+                                       hdr->addr1);
                         sta_id = iwl3945_add_station(priv,
                                     hdr->addr1, 0, CMD_ASYNC);
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 7ca5627cc078..8a00245be51e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -759,7 +759,6 @@ u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr)
         int i;
         int ret = IWL_INVALID_STATION;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
         for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++)
@@ -770,8 +769,8 @@ u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr)
                         goto out;
                 }
 
-        IWL_DEBUG_INFO("can not find STA %s (total %d)\n",
-                       print_mac(mac, addr), priv->num_stations);
+        IWL_DEBUG_INFO("can not find STA %pM (total %d)\n",
+                       addr, priv->num_stations);
  out:
         spin_unlock_irqrestore(&priv->sta_lock, flags);
         return ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index e2a58e477036..b497d40dc396 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -357,11 +357,9 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
                                       struct iwl_lq_sta *lq_data, u8 tid,
                                       struct ieee80211_sta *sta)
 {
-        DECLARE_MAC_BUF(mac);
-
         if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {
-                IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n",
-                                print_mac(mac, sta->addr), tid);
+                IWL_DEBUG_HT("Starting Tx agg: STA: %pM tid: %d\n",
+                                sta->addr, tid);
                 ieee80211_start_tx_ba_session(priv->hw, sta->addr, tid);
         }
 }
@@ -2132,11 +2130,10 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,
         if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) &&
             !lq_sta->ibss_sta_added) {
                 u8 sta_id = iwl_find_station(priv, hdr->addr1);
-                DECLARE_MAC_BUF(mac);
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                       print_mac(mac, hdr->addr1));
+                        IWL_DEBUG_RATE("LQ: ADD station %pM\n",
+                                       hdr->addr1);
                         sta_id = iwl_add_station_flags(priv, hdr->addr1,
                                                         0, CMD_ASYNC, NULL);
                 }
@@ -2205,15 +2202,12 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband,
         lq_sta->ibss_sta_added = 0;
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
                 u8 sta_id = iwl_find_station(priv, sta->addr);
-                DECLARE_MAC_BUF(mac);
 
                 /* for IBSS the call are from tasklet */
-                IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                             print_mac(mac, sta->addr));
+                IWL_DEBUG_RATE("LQ: ADD station %pM\n", sta->addr);
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                       print_mac(mac, sta->addr));
+                        IWL_DEBUG_RATE("LQ: ADD station %pM\n", sta->addr);
                         sta_id = iwl_add_station_flags(priv, sta->addr,
                                                         0, CMD_ASYNC, NULL);
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 24a1aeb6448f..2af9a14446e4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -239,7 +239,6 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
 {
         /* cast away the const for active_rxon in this function */
         struct iwl_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
-        DECLARE_MAC_BUF(mac);
         int ret;
         bool new_assoc =
                 !!(priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK);
@@ -300,10 +299,10 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
         IWL_DEBUG_INFO("Sending RXON\n"
                        "* with%s RXON_FILTER_ASSOC_MSK\n"
                        "* channel = %d\n"
-                       "* bssid = %s\n",
+                       "* bssid = %pM\n",
                        (new_assoc ? "" : "out"),
                        le16_to_cpu(priv->staging_rxon.channel),
-                       print_mac(mac, priv->staging_rxon.bssid_addr));
+                       priv->staging_rxon.bssid_addr);
 
         iwl4965_set_rxon_hwcrypto(priv, !priv->hw_params.sw_crypto);
 
@@ -1464,7 +1463,6 @@ void iwl_rx_handle(struct iwl_priv *priv)
 static void iwl4965_print_rx_config_cmd(struct iwl_priv *priv)
 {
         struct iwl_rxon_cmd *rxon = &priv->staging_rxon;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_RADIO("RX CONFIG:\n");
         iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
@@ -1476,10 +1474,8 @@ static void iwl4965_print_rx_config_cmd(struct iwl_priv *priv)
         IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
                         rxon->ofdm_basic_rates);
         IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
-                        print_mac(mac, rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
-                        print_mac(mac, rxon->bssid_addr));
+        IWL_DEBUG_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
         IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
 }
 #endif
@@ -2466,7 +2462,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
 {
         struct ieee80211_conf *conf = NULL;
         int ret = 0;
-        DECLARE_MAC_BUF(mac);
         unsigned long flags;
 
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
@@ -2474,9 +2469,8 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
                 return;
         }
 
-        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
-                        priv->assoc_id,
-                        print_mac(mac, priv->active_rxon.bssid_addr));
+        IWL_DEBUG_ASSOC("Associated as %d to: %pM\n",
+                        priv->assoc_id, priv->active_rxon.bssid_addr);
 
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
@@ -2722,7 +2716,6 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
 {
         struct iwl_priv *priv = hw->priv;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
 
@@ -2739,7 +2732,7 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->mac_addr) {
-                IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));
+                IWL_DEBUG_MAC80211("Set %pM\n", conf->mac_addr);
                 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
         }
 
@@ -2948,7 +2941,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                                     struct ieee80211_if_conf *conf)
 {
         struct iwl_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
         unsigned long flags;
         int rc;
 
@@ -2983,8 +2975,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->bssid)
-                IWL_DEBUG_MAC80211("bssid: %s\n",
-                                   print_mac(mac, conf->bssid));
+                IWL_DEBUG_MAC80211("bssid: %pM\n", conf->bssid);
 
 /*
  * very dubious code was here; the probe filtering flag is never set:
@@ -2997,8 +2988,8 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                 if (!conf->bssid) {
                         conf->bssid = priv->mac_addr;
                         memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
-                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
-                                           print_mac(mac, conf->bssid));
+                        IWL_DEBUG_MAC80211("bssid was set to: %pM\n",
+                                           conf->bssid);
                 }
                 if (priv->ibss_beacon)
                         dev_kfree_skb(priv->ibss_beacon);
@@ -3241,14 +3232,13 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
         unsigned long flags;
         __le16 key_flags = 0;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter\n");
 
         sta_id = iwl_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   print_mac(mac, addr));
+                IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",
+                                   addr);
                 return;
         }
 
@@ -3285,7 +3275,6 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                            struct ieee80211_key_conf *key)
 {
         struct iwl_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
         int ret = 0;
         u8 sta_id = IWL_INVALID_STATION;
         u8 is_default_wep_key = 0;
@@ -3303,8 +3292,8 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         sta_id = iwl_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   print_mac(mac, addr));
+                IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",
+                                   addr);
                 return -EINVAL;
 
         }
@@ -3405,10 +3394,9 @@ static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
                              struct ieee80211_sta *sta, u16 tid, u16 *ssn)
 {
         struct iwl_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
 
-        IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n",
-                     print_mac(mac, sta->addr), tid);
+        IWL_DEBUG_HT("A-MPDU action on addr %pM tid %d\n",
+                     sta->addr, tid);
 
         if (!(priv->cfg->sku & IWL_SKU_N))
                 return -EACCES;
@@ -4171,7 +4159,6 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         struct ieee80211_hw *hw;
         struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         /************************
          * 1. Allocating HW data
@@ -4280,7 +4267,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         /* extract MAC Address */
         iwl_eeprom_get_mac(priv, priv->mac_addr);
-        IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
+        IWL_DEBUG_INFO("MAC address: %pM\n", priv->mac_addr);
         SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
 
         /************************
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 20db0eb636a8..753f9387aa68 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -228,7 +228,6 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
         ssize_t ret;
         /* Add 30 for initial string */
         const size_t bufsz = 30 + sizeof(char) * 500 * (priv->num_stations);
-        DECLARE_MAC_BUF(mac);
 
         buf = kmalloc(bufsz, GFP_KERNEL);
         if (!buf)
@@ -242,7 +241,6 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
                 if (station->used) {
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         "station %d:\ngeneral data:\n", i+1);
-                        print_mac(mac, station->sta.sta.addr);
                         pos += scnprintf(buf + pos, bufsz - pos, "id: %u\n",
                                         station->sta.sta.sta_id);
                         pos += scnprintf(buf + pos, bufsz - pos, "mode: %u\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 61797f3f8d5c..e02c4717c93c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -45,7 +45,6 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)
         int start = 0;
         int ret = IWL_INVALID_STATION;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) ||
             (priv->iw_mode == NL80211_IFTYPE_AP))
@@ -63,8 +62,8 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)
                         goto out;
                 }
 
-        IWL_DEBUG_ASSOC_LIMIT("can not find STA %s total %d\n",
-                              print_mac(mac, addr), priv->num_stations);
+        IWL_DEBUG_ASSOC_LIMIT("can not find STA %pM total %d\n",
+                              addr, priv->num_stations);
 
  out:
         spin_unlock_irqrestore(&priv->sta_lock, flags);
@@ -86,7 +85,6 @@ EXPORT_SYMBOL(iwl_get_ra_sta_id);
 static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
 {
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -94,8 +92,8 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
                 IWL_ERROR("ACTIVATE a non DRIVER active station %d\n", sta_id);
 
         priv->stations[sta_id].used |= IWL_STA_UCODE_ACTIVE;
-        IWL_DEBUG_ASSOC("Added STA to Ucode: %s\n",
-                        print_mac(mac, priv->stations[sta_id].sta.sta.addr));
+        IWL_DEBUG_ASSOC("Added STA to Ucode: %pM\n",
+                        priv->stations[sta_id].sta.sta.addr);
 
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
@@ -237,7 +235,6 @@ u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,
         int sta_id = IWL_INVALID_STATION;
         struct iwl_station_entry *station;
         unsigned long flags_spin;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags_spin);
         if (is_ap)
@@ -273,8 +270,8 @@ u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,
 
         station = &priv->stations[sta_id];
         station->used = IWL_STA_DRIVER_ACTIVE;
-        IWL_DEBUG_ASSOC("Add STA to driver ID %d: %s\n",
-                        sta_id, print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Add STA to driver ID %d: %pM\n",
+                        sta_id, addr);
         priv->num_stations++;
 
         /* Set up the REPLY_ADD_STA command to send to device */
@@ -301,14 +298,11 @@ EXPORT_SYMBOL(iwl_add_station_flags);
 static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr)
 {
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
-
         u8 sta_id = iwl_find_station(priv, addr);
 
         BUG_ON(sta_id == IWL_INVALID_STATION);
 
-        IWL_DEBUG_ASSOC("Removed STA from Ucode: %s\n",
-                        print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Removed STA from Ucode: %pM\n", addr);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -415,7 +409,6 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
         int sta_id = IWL_INVALID_STATION;
         int i, ret = -EINVAL;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -435,18 +428,18 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
         if (unlikely(sta_id == IWL_INVALID_STATION))
                 goto out;
 
-        IWL_DEBUG_ASSOC("Removing STA from driver:%d  %s\n",
-                sta_id, print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Removing STA from driver:%d  %pM\n",
+                sta_id, addr);
 
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) {
-                IWL_ERROR("Removing %s but non DRIVER active\n",
-                                print_mac(mac, addr));
+                IWL_ERROR("Removing %pM but non DRIVER active\n",
+                                addr);
                 goto out;
         }
 
         if (!(priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE)) {
-                IWL_ERROR("Removing %s but non UCODE active\n",
-                                print_mac(mac, addr));
+                IWL_ERROR("Removing %pM but non UCODE active\n",
+                                addr);
                 goto out;
         }
 
@@ -927,7 +920,6 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
 {
         int sta_id;
         u16 fc = le16_to_cpu(hdr->frame_control);
-        DECLARE_MAC_BUF(mac);
 
         /* If this frame is broadcast or management, use broadcast station id */
         if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) ||
@@ -962,9 +954,9 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                 if (sta_id != IWL_INVALID_STATION)
                         return sta_id;
 
-                IWL_DEBUG_DROP("Station %s not in station map. "
+                IWL_DEBUG_DROP("Station %pM not in station map. "
                                "Defaulting to broadcast...\n",
-                               print_mac(mac, hdr->addr1));
+                               hdr->addr1);
                 iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
                 return priv->hw_params.bcast_sta_id;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 907a53ebc6e4..37ebcff409e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -830,10 +830,8 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         /* Find (or create) index into station table for destination station */
         sta_id = iwl_get_sta_id(priv, hdr);
         if (sta_id == IWL_INVALID_STATION) {
-                DECLARE_MAC_BUF(mac);
-
-                IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
-                               print_mac(mac, hdr->addr1));
+                IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
+                               hdr->addr1);
                 goto drop;
         }
 
@@ -1248,15 +1246,14 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
         int ret;
         unsigned long flags;
         struct iwl_tid_data *tid_data;
-        DECLARE_MAC_BUF(mac);
 
         if (likely(tid < ARRAY_SIZE(default_tid_to_tx_fifo)))
                 tx_fifo = default_tid_to_tx_fifo[tid];
         else
                 return -EINVAL;
 
-        IWL_WARNING("%s on ra = %s tid = %d\n",
-                        __func__, print_mac(mac, ra), tid);
+        IWL_WARNING("%s on ra = %pM tid = %d\n",
+                        __func__, ra, tid);
 
         sta_id = iwl_find_station(priv, ra);
         if (sta_id == IWL_INVALID_STATION)
@@ -1301,7 +1298,6 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
         struct iwl_tid_data *tid_data;
         int ret, write_ptr, read_ptr;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         if (!ra) {
                 IWL_ERROR("ra = NULL\n");
@@ -1467,7 +1463,6 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
         int index;
         struct iwl_tx_queue *txq = NULL;
         struct iwl_ht_agg *agg;
-        DECLARE_MAC_BUF(mac);
 
         /* "flow" corresponds to Tx queue */
         u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
@@ -1489,10 +1484,10 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
 
         /* TODO: Need to get this copy more safely - now good for debug */
 
-        IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %s, "
+        IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %pM, "
                            "sta_id = %d\n",
                            agg->wait_for_ba,
-                           print_mac(mac, (u8 *) &ba_resp->sta_addr_lo32),
+                           (u8 *) &ba_resp->sta_addr_lo32,
                            ba_resp->sta_id);
         IWL_DEBUG_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx, scd_flow = "
                            "%d, scd_ssn = %d\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d15a2c997954..d3a2966d9181 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -446,7 +446,6 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
         int index = IWL_INVALID_STATION;
         struct iwl3945_station_entry *station;
         unsigned long flags_spin;
-        DECLARE_MAC_BUF(mac);
         u8 rate;
 
         spin_lock_irqsave(&priv->sta_lock, flags_spin);
@@ -480,7 +479,7 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
                 return index;
         }
 
-        IWL_DEBUG_ASSOC("Add STA ID %d: %s\n", index, print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Add STA ID %d: %pM\n", index, addr);
         station = &priv->stations[index];
         station->used = 1;
         priv->num_stations++;
@@ -1063,7 +1062,6 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
         /* cast away the const for active_rxon in this function */
         struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
         int rc = 0;
-        DECLARE_MAC_BUF(mac);
 
         if (!iwl3945_is_alive(priv))
                 return -1;
@@ -1124,11 +1122,11 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
         IWL_DEBUG_INFO("Sending RXON\n"
                        "* with%s RXON_FILTER_ASSOC_MSK\n"
                        "* channel = %d\n"
-                       "* bssid = %s\n",
+                       "* bssid = %pM\n",
                        ((priv->staging_rxon.filter_flags &
                          RXON_FILTER_ASSOC_MSK) ? "" : "out"),
                        le16_to_cpu(priv->staging_rxon.channel),
-                       print_mac(mac, priv->staging_rxon.bssid_addr));
+                       priv->staging_rxon.bssid_addr);
 
         /* Apply the new configuration */
         rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON,
@@ -2482,8 +2480,6 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
         /* If this frame is going out to an IBSS network, find the station,
          * or create a new station table entry */
         case NL80211_IFTYPE_ADHOC: {
-                DECLARE_MAC_BUF(mac);
-
                 /* Create new station table entry */
                 sta_id = iwl3945_hw_find_station(priv, hdr->addr1);
                 if (sta_id != IWL_INVALID_STATION)
@@ -2494,9 +2490,9 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
                 if (sta_id != IWL_INVALID_STATION)
                         return sta_id;
 
-                IWL_DEBUG_DROP("Station %s not in station map. "
+                IWL_DEBUG_DROP("Station %pM not in station map. "
                                "Defaulting to broadcast...\n",
-                               print_mac(mac, hdr->addr1));
+                               hdr->addr1);
                 iwl3945_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
                 return priv->hw_setting.bcast_sta_id;
         }
@@ -2579,10 +2575,8 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
         /* Find (or create) index into station table for destination station */
         sta_id = iwl3945_get_sta_id(priv, hdr);
         if (sta_id == IWL_INVALID_STATION) {
-                DECLARE_MAC_BUF(mac);
-
-                IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
-                               print_mac(mac, hdr->addr1));
+                IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
+                               hdr->addr1);
                 goto drop;
         }
 
@@ -4019,8 +4013,6 @@ static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv,
 #ifdef CONFIG_IWL3945_DEBUG
 static void iwl3945_print_rx_config_cmd(struct iwl3945_rxon_cmd *rxon)
 {
-        DECLARE_MAC_BUF(mac);
-
         IWL_DEBUG_RADIO("RX CONFIG:\n");
         iwl3945_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
         IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
@@ -4031,10 +4023,8 @@ static void iwl3945_print_rx_config_cmd(struct iwl3945_rxon_cmd *rxon)
         IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
                         rxon->ofdm_basic_rates);
         IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
-                        print_mac(mac, rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
-                        print_mac(mac, rxon->bssid_addr));
+        IWL_DEBUG_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
         IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
 }
 #endif
@@ -6321,7 +6311,6 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
 {
         int rc = 0;
         struct ieee80211_conf *conf = NULL;
-        DECLARE_MAC_BUF(mac);
 
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
                 IWL_ERROR("%s Should not be called in AP mode\n", __func__);
@@ -6329,9 +6318,8 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
         }
 
 
-        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
-                        priv->assoc_id,
-                        print_mac(mac, priv->active_rxon.bssid_addr));
+        IWL_DEBUG_ASSOC("Associated as %d to: %pM\n",
+                        priv->assoc_id, priv->active_rxon.bssid_addr);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -6592,7 +6580,6 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
 {
         struct iwl3945_priv *priv = hw->priv;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
 
@@ -6609,7 +6596,7 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->mac_addr) {
-                IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));
+                IWL_DEBUG_MAC80211("Set: %pM\n", conf->mac_addr);
                 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
         }
 
@@ -6778,7 +6765,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
                                     struct ieee80211_if_conf *conf)
 {
         struct iwl3945_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
         unsigned long flags;
         int rc;
 
@@ -6816,8 +6802,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->bssid)
-                IWL_DEBUG_MAC80211("bssid: %s\n",
-                                   print_mac(mac, conf->bssid));
+                IWL_DEBUG_MAC80211("bssid: %pM\n", conf->bssid);
 
 /*
  * very dubious code was here; the probe filtering flag is never set:
@@ -6830,8 +6815,8 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
                 if (!conf->bssid) {
                         conf->bssid = priv->mac_addr;
                         memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
-                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
-                                           print_mac(mac, conf->bssid));
+                        IWL_DEBUG_MAC80211("bssid was set to: %pM\n",
+                                           conf->bssid);
                 }
                 if (priv->ibss_beacon)
                         dev_kfree_skb(priv->ibss_beacon);
@@ -7072,10 +7057,8 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         sta_id = iwl3945_hw_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
-                DECLARE_MAC_BUF(mac);
-
-                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   print_mac(mac, addr));
+                IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",
+                                   addr);
                 return -EINVAL;
         }
 
@@ -7870,7 +7853,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         struct ieee80211_hw *hw;
         struct iwl_3945_cfg *cfg = (struct iwl_3945_cfg *)(ent->driver_data);
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         /* Disabling hardware scan means that mac80211 will perform scans
          * "the hard way", rather than using device's scan. */
@@ -8045,7 +8027,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         }
         /* MAC Address location in EEPROM same for 3945/4965 */
         get_eeprom_mac(priv, priv->mac_addr);
-        IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
+        IWL_DEBUG_INFO("MAC address: %pM\n", priv->mac_addr);
         SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
 
         err = iwl3945_init_channel_map(priv);