iwlwifi: clean up printing

Use IWL_ macros where possible to unify debug output usage.
Define new unconditional printouts IWL_ERR, IWL_WARN, IWL_INFO,
and IWL_CRIT which don't use hidden priv pointer.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index bee83d6a51c..4100b155531 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -511,16 +511,14 @@ static int iwlcore_init_geos(struct iwl_priv *priv)
 
         if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
              priv->cfg->sku & IWL_SKU_A) {
-                dev_printk(KERN_INFO, &(priv->hw->wiphy->dev),
-                           "Incorrectly detected BG card as ABG.  Please send "
-                           "your PCI ID 0x%04X:0x%04X to maintainer.\n",
+                IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
+                        "Please send your PCI ID 0x%04X:0x%04X to maintainer.\n",
                            priv->pci_dev->device,
                            priv->pci_dev->subsystem_device);
                 priv->cfg->sku &= ~IWL_SKU_A;
         }
 
-        dev_printk(KERN_INFO, &(priv->hw->wiphy->dev),
-                   "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
+        IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
                    priv->bands[IEEE80211_BAND_2GHZ].n_channels,
                    priv->bands[IEEE80211_BAND_5GHZ].n_channels);