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, 19 insertions, 17 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 41e9013c7427..672574fb5262 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -87,7 +87,8 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
         spin_lock_irqsave(&priv->sta_lock, flags);
 
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE))
-                IWL_ERROR("ACTIVATE a non DRIVER active station %d\n", sta_id);
+                IWL_ERR(priv, "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: %pM\n",
@@ -105,13 +106,13 @@ static int iwl_add_sta_callback(struct iwl_priv *priv,
         u8 sta_id = addsta->sta.sta_id;
 
         if (!skb) {
-                IWL_ERROR("Error: Response NULL in REPLY_ADD_STA.\n");
+                IWL_ERR(priv, "Error: Response NULL in REPLY_ADD_STA.\n");
                 return 1;
         }
 
         res = (struct iwl_rx_packet *)skb->data;
         if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERROR("Bad return from REPLY_ADD_STA (0x%08X)\n",
+                IWL_ERR(priv, "Bad return from REPLY_ADD_STA (0x%08X)\n",
                           res->hdr.flags);
                 return 1;
         }
@@ -155,7 +156,7 @@ static int iwl_send_add_sta(struct iwl_priv *priv,
 
         res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
         if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERROR("Bad return from REPLY_ADD_STA (0x%08X)\n",
+                IWL_ERR(priv, "Bad return from REPLY_ADD_STA (0x%08X)\n",
                           res->hdr.flags);
                 ret = -EIO;
         }
@@ -307,7 +308,7 @@ static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr)
 
         /* Ucode must be active and driver must be non active */
         if (priv->stations[sta_id].used != IWL_STA_UCODE_ACTIVE)
-                IWL_ERROR("removed non active STA %d\n", sta_id);
+                IWL_ERR(priv, "removed non active STA %d\n", sta_id);
 
         priv->stations[sta_id].used &= ~IWL_STA_UCODE_ACTIVE;
 
@@ -324,13 +325,13 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv,
         const char *addr = rm_sta->addr;
 
         if (!skb) {
-                IWL_ERROR("Error: Response NULL in REPLY_REMOVE_STA.\n");
+                IWL_ERR(priv, "Error: Response NULL in REPLY_REMOVE_STA.\n");
                 return 1;
         }
 
         res = (struct iwl_rx_packet *)skb->data;
         if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERROR("Bad return from REPLY_REMOVE_STA (0x%08X)\n",
+                IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",
                 res->hdr.flags);
                 return 1;
         }
@@ -340,7 +341,7 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv,
                 iwl_sta_ucode_deactivate(priv, addr);
                 break;
         default:
-                IWL_ERROR("REPLY_REMOVE_STA failed\n");
+                IWL_ERR(priv, "REPLY_REMOVE_STA failed\n");
                 break;
         }
 
@@ -378,7 +379,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, const u8 *addr,
 
         res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
         if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERROR("Bad return from REPLY_REMOVE_STA (0x%08X)\n",
+                IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",
                           res->hdr.flags);
                 ret = -EIO;
         }
@@ -391,7 +392,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, const u8 *addr,
                         break;
                 default:
                         ret = -EIO;
-                        IWL_ERROR("REPLY_REMOVE_STA failed\n");
+                        IWL_ERR(priv, "REPLY_REMOVE_STA failed\n");
                         break;
                 }
         }
@@ -433,13 +434,13 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
                 sta_id, addr);
 
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) {
-                IWL_ERROR("Removing %pM but non DRIVER active\n",
+                IWL_ERR(priv, "Removing %pM but non DRIVER active\n",
                                 addr);
                 goto out;
         }
 
         if (!(priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE)) {
-                IWL_ERROR("Removing %pM but non UCODE active\n",
+                IWL_ERR(priv, "Removing %pM but non UCODE active\n",
                                 addr);
                 goto out;
         }
@@ -475,7 +476,7 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
         if (iwl_is_alive(priv) &&
            !test_bit(STATUS_EXIT_PENDING, &priv->status) &&
            iwl_send_cmd_pdu_async(priv, REPLY_REMOVE_ALL_STA, 0, NULL, NULL))
-                IWL_ERROR("Couldn't clear the station table\n");
+                IWL_ERR(priv, "Couldn't clear the station table\n");
 
         priv->num_stations = 0;
         memset(priv->stations, 0, sizeof(priv->stations));
@@ -548,7 +549,7 @@ int iwl_remove_default_wep_key(struct iwl_priv *priv,
         spin_lock_irqsave(&priv->sta_lock, flags);
 
         if (!test_and_clear_bit(keyconf->keyidx, &priv->ucode_key_table))
-                IWL_ERROR("index %d not used in uCode key table.\n",
+                IWL_ERR(priv, "index %d not used in uCode key table.\n",
                           keyconf->keyidx);
 
         priv->default_wep_key--;
@@ -582,7 +583,7 @@ int iwl_set_default_wep_key(struct iwl_priv *priv,
         priv->default_wep_key++;
 
         if (test_and_set_bit(keyconf->keyidx, &priv->ucode_key_table))
-                IWL_ERROR("index %d already used in uCode key table.\n",
+                IWL_ERR(priv, "index %d already used in uCode key table.\n",
                         keyconf->keyidx);
 
         priv->wep_keys[keyconf->keyidx].key_size = keyconf->keylen;
@@ -820,7 +821,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
 
         if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset,
                 &priv->ucode_key_table))
-                IWL_ERROR("index %d not used in uCode key table.\n",
+                IWL_ERR(priv, "index %d not used in uCode key table.\n",
                         priv->stations[sta_id].sta.key.key_offset);
         memset(&priv->stations[sta_id].keyinfo, 0,
                                         sizeof(struct iwl_hw_key));
@@ -857,7 +858,8 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,
                 ret = iwl_set_wep_dynamic_key_info(priv, keyconf, sta_id);
                 break;
         default:
-                IWL_ERROR("Unknown alg: %s alg = %d\n", __func__, keyconf->alg);
+                IWL_ERR(priv,
+                        "Unknown alg: %s alg = %d\n", __func__, keyconf->alg);
                 ret = -EINVAL;
         }