iwlwifi: replace IWL_WARNING with IWL_WARN
Winkler, Tomas [Fri, 19 Dec 2008 02:37:32 +0000 (10:37 +0800)]
IWL_WARN doesn'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>

12 files changed:
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-debug.h
drivers/net/wireless/iwlwifi/iwl-rfkill.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c

index 328e55f..4a2cc78 100644 (file)
@@ -158,7 +158,7 @@ void iwl3945_disable_events(struct iwl_priv *priv)
 
        ret = iwl_grab_nic_access(priv);
        if (ret) {
-               IWL_WARNING("Can not read from adapter at this time.\n");
+               IWL_WARN(priv, "Can not read from adapter at this time.\n");
                return;
        }
 
@@ -2095,7 +2095,7 @@ static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv)
 
                /* sanity check on factory saturation power value */
                if (group->saturation_power < 40) {
-                       IWL_WARNING("Error: saturation power is %d, "
+                       IWL_WARN(priv, "Error: saturation power is %d, "
                                    "less than minimum expected 40\n",
                                    group->saturation_power);
                        return;
index 4822362..3de8d64 100644 (file)
@@ -1485,12 +1485,12 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
 
                        /* stay within the table! */
                        if (power_index > 107) {
-                               IWL_WARNING("txpower index %d > 107\n",
+                               IWL_WARN(priv, "txpower index %d > 107\n",
                                            power_index);
                                power_index = 107;
                        }
                        if (power_index < 0) {
-                               IWL_WARNING("txpower index %d < 0\n",
+                               IWL_WARN(priv, "txpower index %d < 0\n",
                                            power_index);
                                power_index = 0;
                        }
@@ -1533,7 +1533,7 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv)
                /* If this gets hit a lot, switch it to a BUG() and catch
                 * the stack trace to find out who is calling this during
                 * a scan. */
-               IWL_WARNING("TX Power requested while scanning!\n");
+               IWL_WARN(priv, "TX Power requested while scanning!\n");
                return -EAGAIN;
        }
 
@@ -1839,7 +1839,8 @@ static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
 
        if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
            (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {
-               IWL_WARNING("queue number out of range: %d, must be %d to %d\n",
+               IWL_WARN(priv,
+                       "queue number out of range: %d, must be %d to %d\n",
                        txq_id, IWL49_FIRST_AMPDU_QUEUE,
                        IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);
                return -EINVAL;
@@ -1910,7 +1911,8 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id,
 
        if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
            (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {
-               IWL_WARNING("queue number out of range: %d, must be %d to %d\n",
+               IWL_WARN(priv,
+                       "queue number out of range: %d, must be %d to %d\n",
                        txq_id, IWL49_FIRST_AMPDU_QUEUE,
                        IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);
                return -EINVAL;
index 338444a..448bdb6 100644 (file)
@@ -676,7 +676,8 @@ static void iwl5000_init_alive_start(struct iwl_priv *priv)
        iwl_clear_stations_table(priv);
        ret = priv->cfg->ops->lib->alive_notify(priv);
        if (ret) {
-               IWL_WARNING("Could not complete ALIVE transition: %d\n", ret);
+               IWL_WARN(priv,
+                       "Could not complete ALIVE transition: %d\n", ret);
                goto restart;
        }
 
@@ -1012,7 +1013,8 @@ static int iwl5000_txq_agg_enable(struct iwl_priv *priv, int txq_id,
 
        if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||
            (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {
-               IWL_WARNING("queue number out of range: %d, must be %d to %d\n",
+               IWL_WARN(priv,
+                       "queue number out of range: %d, must be %d to %d\n",
                        txq_id, IWL50_FIRST_AMPDU_QUEUE,
                        IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);
                return -EINVAL;
@@ -1077,7 +1079,8 @@ static int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
 
        if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||
            (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {
-               IWL_WARNING("queue number out of range: %d, must be %d to %d\n",
+               IWL_WARN(priv,
+                       "queue number out of range: %d, must be %d to %d\n",
                        txq_id, IWL50_FIRST_AMPDU_QUEUE,
                        IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);
                return -EINVAL;
index 392d96d..16e656a 100644 (file)
@@ -51,53 +51,53 @@ int iwl_agn_check_rxon_cmd(struct iwl_priv *priv)
                                (RXON_FLG_TGJ_NARROW_BAND_MSK |
                                 RXON_FLG_RADAR_DETECT_MSK));
                if (error)
-                       IWL_WARNING("check 24G fields %d | %d\n",
+                       IWL_WARN(priv, "check 24G fields %d | %d\n",
                                    counter++, error);
        } else {
                error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ?
                                0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK);
                if (error)
-                       IWL_WARNING("check 52 fields %d | %d\n",
+                       IWL_WARN(priv, "check 52 fields %d | %d\n",
                                    counter++, error);
                error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK);
                if (error)
-                       IWL_WARNING("check 52 CCK %d | %d\n",
+                       IWL_WARN(priv, "check 52 CCK %d | %d\n",
                                    counter++, error);
        }
        error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1;
        if (error)
-               IWL_WARNING("check mac addr %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check mac addr %d | %d\n", counter++, error);
 
        /* make sure basic rates 6Mbps and 1Mbps are supported */
        error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) &&
                  ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0));
        if (error)
-               IWL_WARNING("check basic rate %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check basic rate %d | %d\n", counter++, error);
 
        error |= (le16_to_cpu(rxon->assoc_id) > 2007);
        if (error)
-               IWL_WARNING("check assoc id %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check assoc id %d | %d\n", counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
                        == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK));
        if (error)
-               IWL_WARNING("check CCK and short slot %d | %d\n",
+               IWL_WARN(priv, "check CCK and short slot %d | %d\n",
                            counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
                        == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK));
        if (error)
-               IWL_WARNING("check CCK & auto detect %d | %d\n",
+               IWL_WARN(priv, "check CCK & auto detect %d | %d\n",
                            counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
                        RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK);
        if (error)
-               IWL_WARNING("check TGG and auto detect %d | %d\n",
+               IWL_WARN(priv, "check TGG and auto detect %d | %d\n",
                            counter++, error);
 
        if (error)
-               IWL_WARNING("Tuning to channel %d\n",
+               IWL_WARN(priv, "Tuning to channel %d\n",
                            le16_to_cpu(rxon->channel));
 
        if (error) {
index 6e8ab2e..ce290f6 100644 (file)
@@ -337,7 +337,7 @@ static void iwl_clear_free_frames(struct iwl_priv *priv)
        }
 
        if (priv->frames_count) {
-               IWL_WARNING("%d frames still in use.  Did we lose one?\n",
+               IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",
                            priv->frames_count);
                priv->frames_count = 0;
        }
@@ -745,7 +745,7 @@ static int iwl_set_mode(struct iwl_priv *priv, int mode)
 
        cancel_delayed_work(&priv->scan_check);
        if (iwl_scan_cancel_timeout(priv, 100)) {
-               IWL_WARNING("Aborted scan still in progress after 100ms\n");
+               IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
                IWL_DEBUG_MAC80211("leaving - scan abort failed.\n");
                return -EAGAIN;
        }
@@ -841,7 +841,7 @@ static void iwl_rx_reply_alive(struct iwl_priv *priv,
                queue_delayed_work(priv->workqueue, pwork,
                                   msecs_to_jiffies(5));
        else
-               IWL_WARNING("uCode did not respond OK.\n");
+               IWL_WARN(priv, "uCode did not respond OK.\n");
 }
 
 static void iwl_rx_reply_error(struct iwl_priv *priv,
@@ -1193,7 +1193,7 @@ void iwl_rx_handle(struct iwl_priv *priv)
                        if (rxb && rxb->skb)
                                iwl_tx_cmd_complete(priv, rxb);
                        else
-                               IWL_WARNING("Claim null rxb?\n");
+                               IWL_WARN(priv, "Claim null rxb?\n");
                }
 
                /* For now we just don't re-use anything.  We can tweak this
@@ -1457,9 +1457,9 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
                IWL_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
 
        if (inta & ~CSR_INI_SET_MASK) {
-               IWL_WARNING("Disabled INTA bits 0x%08x were pending\n",
+               IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
                         inta & ~CSR_INI_SET_MASK);
-               IWL_WARNING("   with FH_INT = 0x%08x\n", inta_fh);
+               IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);
        }
 
        /* Re-enable all interrupts */
@@ -1511,7 +1511,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
        if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
                /* Hardware disappeared. It might have already raised
                 * an interrupt */
-               IWL_WARNING("HARDWARE GONE?? INTA == 0x%08x\n", inta);
+               IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
                goto unplugged;
        }
 
@@ -1833,8 +1833,8 @@ static void iwl_alive_start(struct iwl_priv *priv)
        iwl_clear_stations_table(priv);
        ret = priv->cfg->ops->lib->alive_notify(priv);
        if (ret) {
-               IWL_WARNING("Could not complete ALIVE transition [ntf]: %d\n",
-                           ret);
+               IWL_WARN(priv,
+                       "Could not complete ALIVE transition [ntf]: %d\n", ret);
                goto restart;
        }
 
@@ -2020,7 +2020,7 @@ static int __iwl_up(struct iwl_priv *priv)
        int ret;
 
        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-               IWL_WARNING("Exit pending; will not bring the NIC up\n");
+               IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");
                return -EIO;
        }
 
@@ -2037,7 +2037,7 @@ static int __iwl_up(struct iwl_priv *priv)
 
        if (iwl_is_rfkill(priv)) {
                iwl_enable_interrupts(priv);
-               IWL_WARNING("Radio disabled by %s RF Kill switch\n",
+               IWL_WARN(priv, "Radio disabled by %s RF Kill switch\n",
                    test_bit(STATUS_RF_KILL_HW, &priv->status) ? "HW" : "SW");
                return 0;
        }
@@ -2163,7 +2163,7 @@ static void iwl_bg_rf_kill(struct work_struct *work)
                        IWL_DEBUG_RF_KILL("Can not turn radio back on - "
                                          "disabled by SW switch\n");
                else
-                       IWL_WARNING("Radio Frequency Kill Switch is On:\n"
+                       IWL_WARN(priv, "Radio Frequency Kill Switch is On:\n"
                                    "Kill switch must be turned off for "
                                    "wireless networking to work.\n");
        }
@@ -2267,7 +2267,7 @@ static void iwl_post_associate(struct iwl_priv *priv)
        ret = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,
                              sizeof(priv->rxon_timing), &priv->rxon_timing);
        if (ret)
-               IWL_WARNING("REPLY_RXON_TIMING failed - "
+               IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
                            "Attempting to continue.\n");
 
        priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -2668,7 +2668,7 @@ static void iwl_config_ap(struct iwl_priv *priv)
                ret = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,
                                sizeof(priv->rxon_timing), &priv->rxon_timing);
                if (ret)
-                       IWL_WARNING("REPLY_RXON_TIMING failed - "
+                       IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
                                        "Attempting to continue.\n");
 
                iwl_set_rxon_chain(priv);
@@ -2774,7 +2774,7 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw,
                /* If there is currently a HW scan going on in the background
                 * then we need to cancel it else the RXON below will fail. */
                if (iwl_scan_cancel_timeout(priv, 100)) {
-                       IWL_WARNING("Aborted scan still in progress "
+                       IWL_WARN(priv, "Aborted scan still in progress "
                                    "after 100ms\n");
                        IWL_DEBUG_MAC80211("leaving - scan abort failed.\n");
                        mutex_unlock(&priv->mutex);
@@ -3467,7 +3467,7 @@ static ssize_t store_flags(struct device *d,
        if (le32_to_cpu(priv->staging_rxon.flags) != flags) {
                /* Cancel any currently running scans... */
                if (iwl_scan_cancel_timeout(priv, 100))
-                       IWL_WARNING("Could not cancel scan.\n");
+                       IWL_WARN(priv, "Could not cancel scan.\n");
                else {
                        IWL_DEBUG_INFO("Commit rxon.flags = 0x%04X\n", flags);
                        priv->staging_rxon.flags = cpu_to_le32(flags);
@@ -3506,7 +3506,7 @@ static ssize_t store_filter_flags(struct device *d,
        if (le32_to_cpu(priv->staging_rxon.filter_flags) != filter_flags) {
                /* Cancel any currently running scans... */
                if (iwl_scan_cancel_timeout(priv, 100))
-                       IWL_WARNING("Could not cancel scan.\n");
+                       IWL_WARN(priv, "Could not cancel scan.\n");
                else {
                        IWL_DEBUG_INFO("Committing rxon.filter_flags = "
                                       "0x%04X\n", filter_flags);
index 4100b15..2bc461a 100644 (file)
@@ -924,13 +924,13 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
 {
        int ret = 0;
        if (tx_power < IWL_TX_POWER_TARGET_POWER_MIN) {
-               IWL_WARNING("Requested user TXPOWER %d below limit.\n",
+               IWL_WARN(priv, "Requested user TXPOWER %d below limit.\n",
                            priv->tx_power_user_lmt);
                return -EINVAL;
        }
 
        if (tx_power > IWL_TX_POWER_TARGET_POWER_MAX) {
-               IWL_WARNING("Requested user TXPOWER %d above limit.\n",
+               IWL_WARN(priv, "Requested user TXPOWER %d above limit.\n",
                            priv->tx_power_user_lmt);
                return -EINVAL;
        }
@@ -1193,7 +1193,7 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv)
 
        ret = iwl_grab_nic_access(priv);
        if (ret) {
-               IWL_WARNING("Can not read from adapter at this time.\n");
+               IWL_WARN(priv, "Can not read from adapter at this time.\n");
                return;
        }
 
@@ -1297,7 +1297,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv)
 
        ret = iwl_grab_nic_access(priv);
        if (ret) {
-               IWL_WARNING("Can not read from adapter at this time.\n");
+               IWL_WARN(priv, "Can not read from adapter at this time.\n");
                return;
        }
 
index d593b83..654dc9c 100644 (file)
@@ -32,7 +32,6 @@
 struct iwl_priv;
 
 #define IWL_ERROR(f, a...) dev_err(&(priv->pci_dev->dev), f, ## a)
-#define IWL_WARNING(f, a...) dev_warn(&(priv->pci_dev->dev), f, ## a)
 #define IWL_ERR(p, f, a...) dev_err(&((p)->pci_dev->dev), f, ## a)
 #define IWL_WARN(p, f, a...) dev_warn(&((p)->pci_dev->dev), f, ## a)
 #define IWL_INFO(p, f, a...) dev_info(&((p)->pci_dev->dev), f, ## a)
index 4b69da3..cece1c5 100644 (file)
@@ -62,7 +62,8 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
                iwl_radio_kill_sw_disable_radio(priv);
                break;
        default:
-               IWL_WARNING("we received unexpected RFKILL state %d\n", state);
+               IWL_WARN(priv, "we received unexpected RFKILL state %d\n",
+                       state);
                break;
        }
 out_unlock:
index 3c803f6..de55d3c 100644 (file)
@@ -650,7 +650,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
        mutex_lock(&priv->mutex);
 
        if (!iwl_is_ready(priv)) {
-               IWL_WARNING("request scan called when driver not ready.\n");
+               IWL_WARN(priv, "request scan called when driver not ready.\n");
                goto done;
        }
 
@@ -773,7 +773,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
                if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_4965)
                        rx_chain = 0x6;
        } else {
-               IWL_WARNING("Invalid scan band count\n");
+               IWL_WARN(priv, "Invalid scan band count\n");
                goto done;
        }
 
index 412f66b..41e9013 100644 (file)
@@ -168,7 +168,7 @@ static int iwl_send_add_sta(struct iwl_priv *priv,
                        break;
                default:
                        ret = -EIO;
-                       IWL_WARNING("REPLY_ADD_STA failed\n");
+                       IWL_WARN(priv, "REPLY_ADD_STA failed\n");
                        break;
                }
        }
@@ -204,7 +204,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,
        case WLAN_HT_CAP_SM_PS_DISABLED:
                break;
        default:
-               IWL_WARNING("Invalid MIMO PS mode %d\n", mimo_ps_mode);
+               IWL_WARN(priv, "Invalid MIMO PS mode %d\n", mimo_ps_mode);
                break;
        }
 
@@ -812,7 +812,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
        }
 
        if (priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
-               IWL_WARNING("Removing wrong key %d 0x%x\n",
+               IWL_WARN(priv, "Removing wrong key %d 0x%x\n",
                            keyconf->keyidx, key_flags);
                spin_unlock_irqrestore(&priv->sta_lock, flags);
                return 0;
@@ -1069,7 +1069,8 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                return priv->hw_params.bcast_sta_id;
 
        default:
-               IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode);
+               IWL_WARN(priv, "Unknown mode of operation: %d\n",
+                       priv->iw_mode);
                return priv->hw_params.bcast_sta_id;
        }
 }
index 13aad39..e829e86 100644 (file)
@@ -1306,7 +1306,7 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
        else
                return -EINVAL;
 
-       IWL_WARNING("%s on ra = %pM tid = %d\n",
+       IWL_WARN(priv, "%s on ra = %pM tid = %d\n",
                        __func__, ra, tid);
 
        sta_id = iwl_find_station(priv, ra);
@@ -1369,7 +1369,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
                return -ENXIO;
 
        if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_ON)
-               IWL_WARNING("Stopping AGG while state not IWL_AGG_ON\n");
+               IWL_WARN(priv, "Stopping AGG while state not IWL_AGG_ON\n");
 
        tid_data = &priv->stations[sta_id].tid[tid];
        ssn = (tid_data->seq_number & IEEE80211_SCTL_SEQ) >> 4;
index 14864cc..26f5364 100644 (file)
@@ -781,59 +781,59 @@ static int iwl3945_check_rxon_cmd(struct iwl_priv *priv)
                                (RXON_FLG_TGJ_NARROW_BAND_MSK |
                                 RXON_FLG_RADAR_DETECT_MSK));
                if (error)
-                       IWL_WARNING("check 24G fields %d | %d\n",
+                       IWL_WARN(priv, "check 24G fields %d | %d\n",
                                    counter++, error);
        } else {
                error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ?
                                0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK);
                if (error)
-                       IWL_WARNING("check 52 fields %d | %d\n",
+                       IWL_WARN(priv, "check 52 fields %d | %d\n",
                                    counter++, error);
                error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK);
                if (error)
-                       IWL_WARNING("check 52 CCK %d | %d\n",
+                       IWL_WARN(priv, "check 52 CCK %d | %d\n",
                                    counter++, error);
        }
        error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1;
        if (error)
-               IWL_WARNING("check mac addr %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check mac addr %d | %d\n", counter++, error);
 
        /* make sure basic rates 6Mbps and 1Mbps are supported */
        error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) &&
                  ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0));
        if (error)
-               IWL_WARNING("check basic rate %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check basic rate %d | %d\n", counter++, error);
 
        error |= (le16_to_cpu(rxon->assoc_id) > 2007);
        if (error)
-               IWL_WARNING("check assoc id %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check assoc id %d | %d\n", counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
                        == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK));
        if (error)
-               IWL_WARNING("check CCK and short slot %d | %d\n",
+               IWL_WARN(priv, "check CCK and short slot %d | %d\n",
                            counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
                        == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK));
        if (error)
-               IWL_WARNING("check CCK & auto detect %d | %d\n",
+               IWL_WARN(priv, "check CCK & auto detect %d | %d\n",
                            counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
                        RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK);
        if (error)
-               IWL_WARNING("check TGG and auto detect %d | %d\n",
+               IWL_WARN(priv, "check TGG and auto detect %d | %d\n",
                            counter++, error);
 
        if ((rxon->flags & RXON_FLG_DIS_DIV_MSK))
                error |= ((rxon->flags & (RXON_FLG_ANT_B_MSK |
                                RXON_FLG_ANT_A_MSK)) == 0);
        if (error)
-               IWL_WARNING("check antenna %d %d\n", counter++, error);
+               IWL_WARN(priv, "check antenna %d %d\n", counter++, error);
 
        if (error)
-               IWL_WARNING("Tuning to channel %d\n",
+               IWL_WARN(priv, "Tuning to channel %d\n",
                            le16_to_cpu(rxon->channel));
 
        if (error) {
@@ -1207,7 +1207,7 @@ int iwl3945_send_add_station(struct iwl_priv *priv,
                        break;
                default:
                        rc = -EIO;
-                       IWL_WARNING("REPLY_ADD_STA failed\n");
+                       IWL_WARN(priv, "REPLY_ADD_STA failed\n");
                        break;
                }
        }
@@ -1289,7 +1289,7 @@ static void iwl3945_clear_free_frames(struct iwl_priv *priv)
        }
 
        if (priv->frames_count) {
-               IWL_WARNING("%d frames still in use.  Did we lose one?\n",
+               IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",
                            priv->frames_count);
                priv->frames_count = 0;
        }
@@ -2187,7 +2187,7 @@ static int iwl3945_set_mode(struct iwl_priv *priv, int mode)
 
        cancel_delayed_work(&priv->scan_check);
        if (iwl3945_scan_cancel_timeout(priv, 100)) {
-               IWL_WARNING("Aborted scan still in progress after 100ms\n");
+               IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
                IWL_DEBUG_MAC80211("leaving - scan abort failed.\n");
                return -EAGAIN;
        }
@@ -2363,7 +2363,8 @@ static int iwl3945_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                return priv->hw_params.bcast_sta_id;
 
        default:
-               IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode);
+               IWL_WARN(priv, "Unknown mode of operation: %d\n",
+                       priv->iw_mode);
                return priv->hw_params.bcast_sta_id;
        }
 }
@@ -2895,7 +2896,7 @@ static void iwl3945_rx_reply_alive(struct iwl_priv *priv,
                queue_delayed_work(priv->workqueue, pwork,
                                   msecs_to_jiffies(5));
        else
-               IWL_WARNING("uCode did not respond OK.\n");
+               IWL_WARN(priv, "uCode did not respond OK.\n");
 }
 
 static void iwl3945_rx_reply_add_sta(struct iwl_priv *priv,
@@ -3789,7 +3790,7 @@ static void iwl3945_rx_handle(struct iwl_priv *priv)
                        if (rxb && rxb->skb)
                                iwl3945_tx_cmd_complete(priv, rxb);
                        else
-                               IWL_WARNING("Claim null rxb?\n");
+                               IWL_WARN(priv, "Claim null rxb?\n");
                }
 
                /* For now we just don't re-use anything.  We can tweak this
@@ -3960,7 +3961,7 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
 
        rc = iwl_grab_nic_access(priv);
        if (rc) {
-               IWL_WARNING("Can not read from adapter at this time.\n");
+               IWL_WARN(priv, "Can not read from adapter at this time.\n");
                return;
        }
 
@@ -4063,7 +4064,7 @@ static void iwl3945_dump_nic_event_log(struct iwl_priv *priv)
 
        rc = iwl_grab_nic_access(priv);
        if (rc) {
-               IWL_WARNING("Can not read from adapter at this time.\n");
+               IWL_WARN(priv, "Can not read from adapter at this time.\n");
                return;
        }
 
@@ -4270,9 +4271,9 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv)
                IWL_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
 
        if (inta & ~CSR_INI_SET_MASK) {
-               IWL_WARNING("Disabled INTA bits 0x%08x were pending\n",
+               IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
                         inta & ~CSR_INI_SET_MASK);
-               IWL_WARNING("   with FH_INT = 0x%08x\n", inta_fh);
+               IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);
        }
 
        /* Re-enable all interrupts */
@@ -4323,7 +4324,7 @@ static irqreturn_t iwl3945_isr(int irq, void *data)
 
        if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
                /* Hardware disappeared */
-               IWL_WARNING("HARDWARE GONE?? INTA == 0x%08x\n", inta);
+               IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
                goto unplugged;
        }
 
@@ -4490,7 +4491,7 @@ static int iwl3945_init_channel_map(struct iwl_priv *priv)
        }
 
        if (priv->eeprom39.version < 0x2f) {
-               IWL_WARNING("Unsupported EEPROM version: 0x%04X\n",
+               IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",
                            priv->eeprom39.version);
                return -EINVAL;
        }
@@ -5583,7 +5584,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
 
        rc = iwl_grab_nic_access(priv);
        if (rc) {
-               IWL_WARNING("Can not read RFKILL status from adapter\n");
+               IWL_WARN(priv, "Can not read RFKILL status from adapter\n");
                return;
        }
 
@@ -5783,12 +5784,12 @@ static int __iwl3945_up(struct iwl_priv *priv)
        int rc, i;
 
        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-               IWL_WARNING("Exit pending; will not bring the NIC up\n");
+               IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");
                return -EIO;
        }
 
        if (test_bit(STATUS_RF_KILL_SW, &priv->status)) {
-               IWL_WARNING("Radio disabled by SW RF kill (module "
+               IWL_WARN(priv, "Radio disabled by SW RF kill (module "
                            "parameter)\n");
                return -ENODEV;
        }
@@ -5805,7 +5806,7 @@ static int __iwl3945_up(struct iwl_priv *priv)
        else {
                set_bit(STATUS_RF_KILL_HW, &priv->status);
                if (!test_bit(STATUS_IN_SUSPEND, &priv->status)) {
-                       IWL_WARNING("Radio disabled by HW RF Kill switch\n");
+                       IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");
                        return -ENODEV;
                }
        }
@@ -5929,7 +5930,7 @@ static void iwl3945_bg_rf_kill(struct work_struct *work)
                        IWL_DEBUG_RF_KILL("Can not turn radio back on - "
                                          "disabled by SW switch\n");
                else
-                       IWL_WARNING("Radio Frequency Kill Switch is On:\n"
+                       IWL_WARN(priv, "Radio Frequency Kill Switch is On:\n"
                                    "Kill switch must be turned off for "
                                    "wireless networking to work.\n");
        }
@@ -5982,7 +5983,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
        mutex_lock(&priv->mutex);
 
        if (!iwl3945_is_ready(priv)) {
-               IWL_WARNING("request scan called when driver not ready.\n");
+               IWL_WARN(priv, "request scan called when driver not ready.\n");
                goto done;
        }
 
@@ -6107,7 +6108,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
                scan->good_CRC_th = IWL_GOOD_CRC_TH;
                band = IEEE80211_BAND_5GHZ;
        } else {
-               IWL_WARNING("Invalid scan band count\n");
+               IWL_WARN(priv, "Invalid scan band count\n");
                goto done;
        }
 
@@ -6228,7 +6229,7 @@ static void iwl3945_post_associate(struct iwl_priv *priv)
        rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON_TIMING,
                              sizeof(priv->rxon_timing), &priv->rxon_timing);
        if (rc)
-               IWL_WARNING("REPLY_RXON_TIMING failed - "
+               IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
                            "Attempting to continue.\n");
 
        priv->staging39_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -6608,7 +6609,7 @@ static void iwl3945_config_ap(struct iwl_priv *priv)
                rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON_TIMING,
                                sizeof(priv->rxon_timing), &priv->rxon_timing);
                if (rc)
-                       IWL_WARNING("REPLY_RXON_TIMING failed - "
+                       IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
                                        "Attempting to continue.\n");
 
                /* FIXME: what should be the assoc_id for AP? */
@@ -6709,7 +6710,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
                /* If there is currently a HW scan going on in the background
                 * then we need to cancel it else the RXON below will fail. */
                if (iwl3945_scan_cancel_timeout(priv, 100)) {
-                       IWL_WARNING("Aborted scan still in progress "
+                       IWL_WARN(priv, "Aborted scan still in progress "
                                    "after 100ms\n");
                        IWL_DEBUG_MAC80211("leaving - scan abort failed.\n");
                        mutex_unlock(&priv->mutex);
@@ -7260,7 +7261,7 @@ static ssize_t store_flags(struct device *d,
        if (le32_to_cpu(priv->staging39_rxon.flags) != flags) {
                /* Cancel any currently running scans... */
                if (iwl3945_scan_cancel_timeout(priv, 100))
-                       IWL_WARNING("Could not cancel scan.\n");
+                       IWL_WARN(priv, "Could not cancel scan.\n");
                else {
                        IWL_DEBUG_INFO("Committing rxon.flags = 0x%04X\n",
                                       flags);
@@ -7295,7 +7296,7 @@ static ssize_t store_filter_flags(struct device *d,
        if (le32_to_cpu(priv->staging39_rxon.filter_flags) != filter_flags) {
                /* Cancel any currently running scans... */
                if (iwl3945_scan_cancel_timeout(priv, 100))
-                       IWL_WARNING("Could not cancel scan.\n");
+                       IWL_WARN(priv, "Could not cancel scan.\n");
                else {
                        IWL_DEBUG_INFO("Committing rxon.filter_flags = "
                                       "0x%04X\n", filter_flags);
@@ -8104,7 +8105,7 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
                iwl3945_radio_kill_sw(priv, 1);
                break;
        default:
-               IWL_WARNING("we received unexpected RFKILL state %d\n", state);
+               IWL_WARN(priv, "received unexpected RFKILL state %d\n", state);
                break;
        }
 out_unlock: