drivers/net/wireless: Use wiphy_<level>

Standardize the logging macros used.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 85 insertions, 91 deletions

diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index e51650ed49f2..d687cb7f2a59 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -149,16 +149,15 @@ static int p54_generate_band(struct ieee80211_hw *dev,
                         continue;
 
                 if (list->channels[i].data != CHAN_HAS_ALL) {
-                        printk(KERN_ERR "%s:%s%s%s is/are missing for "
-                                        "channel:%d [%d MHz].\n",
-                               wiphy_name(dev->wiphy),
-                               (list->channels[i].data & CHAN_HAS_CAL ? "" :
-                                " [iqauto calibration data]"),
-                               (list->channels[i].data & CHAN_HAS_LIMIT ? "" :
-                                " [output power limits]"),
-                               (list->channels[i].data & CHAN_HAS_CURVE ? "" :
-                                " [curve data]"),
-                               list->channels[i].index, list->channels[i].freq);
+                        wiphy_err(dev->wiphy,
+                                  "%s%s%s is/are missing for channel:%d [%d MHz].\n",
+                                  (list->channels[i].data & CHAN_HAS_CAL ? "" :
+                                   " [iqauto calibration data]"),
+                                  (list->channels[i].data & CHAN_HAS_LIMIT ? "" :
+                                   " [output power limits]"),
+                                  (list->channels[i].data & CHAN_HAS_CURVE ? "" :
+                                   " [curve data]"),
+                                  list->channels[i].index, list->channels[i].freq);
                         continue;
                 }
 
@@ -168,9 +167,8 @@ static int p54_generate_band(struct ieee80211_hw *dev,
         }
 
         if (j == 0) {
-                printk(KERN_ERR "%s: Disabling totally damaged %s band.\n",
-                       wiphy_name(dev->wiphy), (band == IEEE80211_BAND_2GHZ) ?
-                       "2 GHz" : "5 GHz");
+                wiphy_err(dev->wiphy, "disabling totally damaged %d GHz band\n",
+                          (band == IEEE80211_BAND_2GHZ) ? 2 : 5);
 
                 ret = -ENODATA;
                 goto err_out;
@@ -244,9 +242,9 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev)
 
         if ((priv->iq_autocal_len != priv->curve_data->entries) ||
             (priv->iq_autocal_len != priv->output_limit->entries))
-                printk(KERN_ERR "%s: Unsupported or damaged EEPROM detected. "
-                                "You may not be able to use all channels.\n",
-                                wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy,
+                          "Unsupported or damaged EEPROM detected. "
+                          "You may not be able to use all channels.\n");
 
         max_channel_num = max_t(unsigned int, priv->output_limit->entries,
                                 priv->iq_autocal_len);
@@ -419,15 +417,14 @@ static void p54_parse_rssical(struct ieee80211_hw *dev, void *data, int len,
         int i;
 
         if (len != (entry_size * num_entries)) {
-                printk(KERN_ERR "%s: unknown rssi calibration data packing "
-                                 " type:(%x) len:%d.\n",
-                       wiphy_name(dev->wiphy), type, len);
+                wiphy_err(dev->wiphy,
+                          "unknown rssi calibration data packing type:(%x) len:%d.\n",
+                          type, len);
 
                 print_hex_dump_bytes("rssical:", DUMP_PREFIX_NONE,
                                      data, len);
 
-                printk(KERN_ERR "%s: please report this issue.\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "please report this issue.\n");
                 return;
         }
 
@@ -445,15 +442,14 @@ static void p54_parse_default_country(struct ieee80211_hw *dev,
         struct pda_country *country;
 
         if (len != sizeof(*country)) {
-                printk(KERN_ERR "%s: found possible invalid default country "
-                                "eeprom entry. (entry size: %d)\n",
-                       wiphy_name(dev->wiphy), len);
+                wiphy_err(dev->wiphy,
+                          "found possible invalid default country eeprom entry. (entry size: %d)\n",
+                          len);
 
                 print_hex_dump_bytes("country:", DUMP_PREFIX_NONE,
                                      data, len);
 
-                printk(KERN_ERR "%s: please report this issue.\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "please report this issue.\n");
                 return;
         }
 
@@ -478,8 +474,8 @@ static int p54_convert_output_limits(struct ieee80211_hw *dev,
                 return -EINVAL;
 
         if (data[0] != 0) {
-                printk(KERN_ERR "%s: unknown output power db revision:%x\n",
-                       wiphy_name(dev->wiphy), data[0]);
+                wiphy_err(dev->wiphy, "unknown output power db revision:%x\n",
+                          data[0]);
                 return -EINVAL;
         }
 
@@ -587,10 +583,9 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                                 err = p54_convert_rev1(dev, curve_data);
                                 break;
                         default:
-                                printk(KERN_ERR "%s: unknown curve data "
-                                                "revision %d\n",
-                                                wiphy_name(dev->wiphy),
-                                                curve_data->cal_method_rev);
+                                wiphy_err(dev->wiphy,
+                                          "unknown curve data revision %d\n",
+                                          curve_data->cal_method_rev);
                                 err = -ENODEV;
                                 break;
                         }
@@ -672,8 +667,8 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
 
         if (!synth || !priv->iq_autocal || !priv->output_limit ||
             !priv->curve_data) {
-                printk(KERN_ERR "%s: not all required entries found in eeprom!\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy,
+                          "not all required entries found in eeprom!\n");
                 err = -EINVAL;
                 goto err;
         }
@@ -699,15 +694,15 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
         if (!is_valid_ether_addr(dev->wiphy->perm_addr)) {
                 u8 perm_addr[ETH_ALEN];
 
-                printk(KERN_WARNING "%s: Invalid hwaddr! Using randomly generated MAC addr\n",
-                        wiphy_name(dev->wiphy));
+                wiphy_warn(dev->wiphy,
+                           "invalid hwaddr! using randomly generated mac addr\n");
                 random_ether_addr(perm_addr);
                 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
         }
 
-        printk(KERN_INFO "%s: hwaddr %pM, MAC:isl38%02x RF:%s\n",
-                wiphy_name(dev->wiphy), dev->wiphy->perm_addr, priv->version,
-                p54_rf_chips[priv->rxhw]);
+        wiphy_info(dev->wiphy, "hwaddr %pm, mac:isl38%02x rf:%s\n",
+                   dev->wiphy->perm_addr, priv->version,
+                   p54_rf_chips[priv->rxhw]);
 
         return 0;
 
@@ -719,8 +714,7 @@ err:
         priv->output_limit = NULL;
         priv->curve_data = NULL;
 
-        printk(KERN_ERR "%s: eeprom parse failed!\n",
-                wiphy_name(dev->wiphy));
+        wiphy_err(dev->wiphy, "eeprom parse failed!\n");
         return err;
 }
 EXPORT_SYMBOL_GPL(p54_parse_eeprom);
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index c43a5d461ab2..47006bca4852 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -62,16 +62,15 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                         case FW_LM20:
                         case FW_LM87: {
                                 char *iftype = (char *)bootrec->data;
-                                printk(KERN_INFO "%s: p54 detected a LM%c%c "
-                                                 "firmware\n",
-                                        wiphy_name(priv->hw->wiphy),
-                                        iftype[2], iftype[3]);
+                                wiphy_info(priv->hw->wiphy,
+                                           "p54 detected a LM%c%c firmware\n",
+                                           iftype[2], iftype[3]);
                                 break;
                                 }
                         case FW_FMAC:
                         default:
-                                printk(KERN_ERR "%s: unsupported firmware\n",
-                                        wiphy_name(priv->hw->wiphy));
+                                wiphy_err(priv->hw->wiphy,
+                                          "unsupported firmware\n");
                                 return -ENODEV;
                         }
                         break;
@@ -125,15 +124,15 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
         }
 
         if (fw_version)
-                printk(KERN_INFO "%s: FW rev %s - Softmac protocol %x.%x\n",
-                        wiphy_name(priv->hw->wiphy), fw_version,
-                        priv->fw_var >> 8, priv->fw_var & 0xff);
+                wiphy_info(priv->hw->wiphy,
+                           "fw rev %s - softmac protocol %x.%x\n",
+                           fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
 
         if (priv->fw_var < 0x500)
-                printk(KERN_INFO "%s: you are using an obsolete firmware. "
-                       "visit http://wireless.kernel.org/en/users/Drivers/p54 "
-                       "and grab one for \"kernel >= 2.6.28\"!\n",
-                        wiphy_name(priv->hw->wiphy));
+                wiphy_info(priv->hw->wiphy,
+                           "you are using an obsolete firmware. "
+                           "visit http://wireless.kernel.org/en/users/Drivers/p54 "
+                           "and grab one for \"kernel >= 2.6.28\"!\n");
 
         if (priv->fw_var >= 0x300) {
                 /* Firmware supports QoS, use it! */
@@ -152,13 +151,14 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                 priv->hw->queues = P54_QUEUE_AC_NUM;
         }
 
-        printk(KERN_INFO "%s: cryptographic accelerator "
-               "WEP:%s, TKIP:%s, CCMP:%s\n", wiphy_name(priv->hw->wiphy),
-                (priv->privacy_caps & BR_DESC_PRIV_CAP_WEP) ? "YES" :
-                "no", (priv->privacy_caps & (BR_DESC_PRIV_CAP_TKIP |
-                BR_DESC_PRIV_CAP_MICHAEL)) ? "YES" : "no",
-                (priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP) ?
-                "YES" : "no");
+        wiphy_info(priv->hw->wiphy,
+                   "cryptographic accelerator WEP:%s, TKIP:%s, CCMP:%s\n",
+                   (priv->privacy_caps & BR_DESC_PRIV_CAP_WEP) ? "YES" : "no",
+                   (priv->privacy_caps &
+                    (BR_DESC_PRIV_CAP_TKIP | BR_DESC_PRIV_CAP_MICHAEL))
+                   ? "YES" : "no",
+                   (priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP)
+                   ? "YES" : "no");
 
         if (priv->rx_keycache_size) {
                 /*
@@ -247,8 +247,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf,
 
         if (!wait_for_completion_interruptible_timeout(
              &priv->eeprom_comp, HZ)) {
-                printk(KERN_ERR "%s: device does not respond!\n",
-                       wiphy_name(priv->hw->wiphy));
+                wiphy_err(priv->hw->wiphy, "device does not respond!\n");
                 ret = -EBUSY;
         }
         priv->eeprom = NULL;
@@ -523,9 +522,9 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
         return 0;
 
 err:
-        printk(KERN_ERR "%s: frequency change to channel %d failed.\n",
-               wiphy_name(priv->hw->wiphy), ieee80211_frequency_to_channel(
-               priv->hw->conf.channel->center_freq));
+        wiphy_err(priv->hw->wiphy, "frequency change to channel %d failed.\n",
+                  ieee80211_frequency_to_channel(
+                          priv->hw->conf.channel->center_freq));
 
         dev_kfree_skb_any(skb);
         return -EINVAL;
@@ -676,8 +675,8 @@ int p54_upload_key(struct p54_common *priv, u8 algo, int slot, u8 idx, u8 len,
                 break;
 
         default:
-                printk(KERN_ERR "%s: invalid cryptographic algorithm: %d\n",
-                       wiphy_name(priv->hw->wiphy), algo);
+                wiphy_err(priv->hw->wiphy,
+                          "invalid cryptographic algorithm: %d\n", algo);
                 dev_kfree_skb(skb);
                 return -EINVAL;
         }
diff --git a/drivers/net/wireless/p54/led.c b/drivers/net/wireless/p54/led.c
index 9575ac033630..ea91f5cce6b3 100644
--- a/drivers/net/wireless/p54/led.c
+++ b/drivers/net/wireless/p54/led.c
@@ -57,8 +57,8 @@ static void p54_update_leds(struct work_struct *work)
 
         err = p54_set_leds(priv);
         if (err && net_ratelimit())
-                printk(KERN_ERR "%s: failed to update LEDs (%d).\n",
-                        wiphy_name(priv->hw->wiphy), err);
+                wiphy_err(priv->hw->wiphy,
+                          "failed to update leds (%d).\n", err);
 
         if (rerun)
                 ieee80211_queue_delayed_work(priv->hw, &priv->led_work,
@@ -102,8 +102,8 @@ static int p54_register_led(struct p54_common *priv,
 
         err = led_classdev_register(wiphy_dev(priv->hw->wiphy), &led->led_dev);
         if (err)
-                printk(KERN_ERR "%s: Failed to register %s LED.\n",
-                        wiphy_name(priv->hw->wiphy), name);
+                wiphy_err(priv->hw->wiphy,
+                          "failed to register %s led.\n", name);
         else
                 led->registered = 1;
 
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index a5ea89cde8c4..822f8dc26e9c 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -466,8 +466,7 @@ static int p54p_open(struct ieee80211_hw *dev)
         P54P_READ(dev_int);
 
         if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
-                printk(KERN_ERR "%s: Cannot boot firmware!\n",
-                       wiphy_name(dev->wiphy));
+                wiphy_err(dev->wiphy, "cannot boot firmware!\n");
                 p54p_stop(dev);
                 return -ETIMEDOUT;
         }
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 4e6891099d43..427b46f558ed 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -38,8 +38,8 @@ static void p54_dump_tx_queue(struct p54_common *priv)
         u32 largest_hole = 0, free;
 
         spin_lock_irqsave(&priv->tx_queue.lock, flags);
-        printk(KERN_DEBUG "%s: / --- tx queue dump (%d entries) ---\n",
-               wiphy_name(priv->hw->wiphy), skb_queue_len(&priv->tx_queue));
+        wiphy_debug(priv->hw->wiphy, "/ --- tx queue dump (%d entries) ---\n",
+                    skb_queue_len(&priv->tx_queue));
 
         prev_addr = priv->rx_start;
         skb_queue_walk(&priv->tx_queue, skb) {
@@ -48,21 +48,23 @@ static void p54_dump_tx_queue(struct p54_common *priv)
                 hdr = (void *) skb->data;
 
                 free = range->start_addr - prev_addr;
-                printk(KERN_DEBUG "%s: | [%02d] => [skb:%p skb_len:0x%04x "
-                       "hdr:{flags:%02x len:%04x req_id:%04x type:%02x} "
-                       "mem:{start:%04x end:%04x, free:%d}]\n",
-                       wiphy_name(priv->hw->wiphy), i++, skb, skb->len,
-                       le16_to_cpu(hdr->flags), le16_to_cpu(hdr->len),
-                       le32_to_cpu(hdr->req_id), le16_to_cpu(hdr->type),
-                       range->start_addr, range->end_addr, free);
+                wiphy_debug(priv->hw->wiphy,
+                            "| [%02d] => [skb:%p skb_len:0x%04x "
+                            "hdr:{flags:%02x len:%04x req_id:%04x type:%02x} "
+                            "mem:{start:%04x end:%04x, free:%d}]\n",
+                            i++, skb, skb->len,
+                            le16_to_cpu(hdr->flags), le16_to_cpu(hdr->len),
+                            le32_to_cpu(hdr->req_id), le16_to_cpu(hdr->type),
+                            range->start_addr, range->end_addr, free);
 
                 prev_addr = range->end_addr;
                 largest_hole = max(largest_hole, free);
         }
         free = priv->rx_end - prev_addr;
         largest_hole = max(largest_hole, free);
-        printk(KERN_DEBUG "%s: \\ --- [free: %d], largest free block: %d ---\n",
-               wiphy_name(priv->hw->wiphy), free, largest_hole);
+        wiphy_debug(priv->hw->wiphy,
+                    "\\ --- [free: %d], largest free block: %d ---\n",
+                    free, largest_hole);
         spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
 }
 #endif /* P54_MM_DEBUG */
@@ -538,8 +540,7 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
         case P54_TRAP_BEACON_TX:
                 break;
         case P54_TRAP_RADAR:
-                printk(KERN_INFO "%s: radar (freq:%d MHz)\n",
-                        wiphy_name(priv->hw->wiphy), freq);
+                wiphy_info(priv->hw->wiphy, "radar (freq:%d mhz)\n", freq);
                 break;
         case P54_TRAP_NO_BEACON:
                 if (priv->vif)
@@ -558,8 +559,8 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
                 wiphy_rfkill_set_hw_state(priv->hw->wiphy, false);
                 break;
         default:
-                printk(KERN_INFO "%s: received event:%x freq:%d\n",
-                       wiphy_name(priv->hw->wiphy), event, freq);
+                wiphy_info(priv->hw->wiphy, "received event:%x freq:%d\n",
+                           event, freq);
                 break;
         }
 }
@@ -584,8 +585,9 @@ static int p54_rx_control(struct p54_common *priv, struct sk_buff *skb)
                 p54_rx_eeprom_readback(priv, skb);
                 break;
         default:
-                printk(KERN_DEBUG "%s: not handling 0x%02x type control frame\n",
-                       wiphy_name(priv->hw->wiphy), le16_to_cpu(hdr->type));
+                wiphy_debug(priv->hw->wiphy,
+                            "not handling 0x%02x type control frame\n",
+                            le16_to_cpu(hdr->type));
                 break;
         }
         return 0;