iwlwifi: replace IWL_ERROR with IWL_ERR

IWL_ERR 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>

1 files changed, 16 insertions, 13 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 448bdb65bffe..76d86fe2b41d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -289,7 +289,7 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)
                 offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_OTHERS);
                 break;
         default:
-                IWL_ERROR("illegal indirect type: 0x%X\n",
+                IWL_ERR(priv, "illegal indirect type: 0x%X\n",
                 address & INDIRECT_TYPE_MSK);
                 break;
         }
@@ -384,7 +384,8 @@ static void iwl5000_chain_noise_reset(struct iwl_priv *priv)
                 ret = iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
                                         sizeof(cmd), &cmd);
                 if (ret)
-                        IWL_ERROR("Could not send REPLY_PHY_CALIBRATION_CMD\n");
+                        IWL_ERR(priv,
+                                "Could not send REPLY_PHY_CALIBRATION_CMD\n");
                 data->state = IWL_CHAIN_NOISE_ACCUMULATE;
                 IWL_DEBUG_CALIB("Run chain_noise_calibrate\n");
         }
@@ -507,7 +508,7 @@ static void iwl5000_rx_calib_result(struct iwl_priv *priv,
                 index = IWL_CALIB_BASE_BAND;
                 break;
         default:
-                IWL_ERROR("Unknown calibration notification %d\n",
+                IWL_ERR(priv, "Unknown calibration notification %d\n",
                           hdr->op_code);
                 return;
         }
@@ -589,12 +590,12 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv,
         ret = wait_event_interruptible_timeout(priv->wait_command_queue,
                                         priv->ucode_write_complete, 5 * HZ);
         if (ret == -ERESTARTSYS) {
-                IWL_ERROR("Could not load the INST uCode section due "
+                IWL_ERR(priv, "Could not load the INST uCode section due "
                         "to interrupt\n");
                 return ret;
         }
         if (!ret) {
-                IWL_ERROR("Could not load the INST uCode section\n");
+                IWL_ERR(priv, "Could not load the INST uCode section\n");
                 return -ETIMEDOUT;
         }
 
@@ -610,11 +611,11 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv,
         ret = wait_event_interruptible_timeout(priv->wait_command_queue,
                                 priv->ucode_write_complete, 5 * HZ);
         if (ret == -ERESTARTSYS) {
-                IWL_ERROR("Could not load the INST uCode section due "
+                IWL_ERR(priv, "Could not load the INST uCode section due "
                         "to interrupt\n");
                 return ret;
         } else if (!ret) {
-                IWL_ERROR("Could not load the DATA uCode section\n");
+                IWL_ERR(priv, "Could not load the DATA uCode section\n");
                 return -ETIMEDOUT;
         } else
                 ret = 0;
@@ -826,8 +827,9 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
 {
         if ((priv->cfg->mod_params->num_of_queues > IWL50_NUM_QUEUES) ||
             (priv->cfg->mod_params->num_of_queues < IWL_MIN_NUM_QUEUES)) {
-                IWL_ERROR("invalid queues_num, should be between %d and %d\n",
-                          IWL_MIN_NUM_QUEUES, IWL50_NUM_QUEUES);
+                IWL_ERR(priv,
+                        "invalid queues_num, should be between %d and %d\n",
+                        IWL_MIN_NUM_QUEUES, IWL50_NUM_QUEUES);
                 return -EINVAL;
         }
 
@@ -1201,8 +1203,9 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv,
 
                         sc = le16_to_cpu(hdr->seq_ctrl);
                         if (idx != (SEQ_TO_SN(sc) & 0xff)) {
-                                IWL_ERROR("BUG_ON idx doesn't match seq control"
-                                          " idx=%d, seq_idx=%d, seq=%d\n",
+                                IWL_ERR(priv,
+                                        "BUG_ON idx doesn't match seq control"
+                                        " idx=%d, seq_idx=%d, seq=%d\n",
                                           idx, SEQ_TO_SN(sc),
                                           hdr->seq_ctrl);
                                 return -1;
@@ -1258,7 +1261,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv,
         int freed;
 
         if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {
-                IWL_ERROR("Read index for DMA queue txq_id (%d) index %d "
+                IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "
                           "is out of range [0-%d] %d %d\n", txq_id,
                           index, txq->q.n_bd, txq->q.write_ptr,
                           txq->q.read_ptr);
@@ -1332,7 +1335,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv,
                 iwl_txq_check_empty(priv, sta_id, tid, txq_id);
 
         if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
-                IWL_ERROR("TODO:  Implement Tx ABORT REQUIRED!!!\n");
+                IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\n");
 }
 
 /* Currently 5000 is the superset of everything */