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, 12 insertions, 10 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index 4b35b30e493e..af14d8fdcc79 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -109,14 +109,14 @@ static int iwl_generic_cmd_callback(struct iwl_priv *priv,
         struct iwl_rx_packet *pkt = NULL;
 
         if (!skb) {
-                IWL_ERROR("Error: Response NULL in %s.\n",
+                IWL_ERR(priv, "Error: Response NULL in %s.\n",
                                 get_cmd_string(cmd->hdr.cmd));
                 return 1;
         }
 
         pkt = (struct iwl_rx_packet *)skb->data;
         if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERROR("Bad return from %s (0x%08X)\n",
+                IWL_ERR(priv, "Bad return from %s (0x%08X)\n",
                         get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
                 return 1;
         }
@@ -156,7 +156,7 @@ static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
 
         ret = iwl_enqueue_hcmd(priv, cmd);
         if (ret < 0) {
-                IWL_ERROR("Error sending %s: enqueue_hcmd failed: %d\n",
+                IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
                           get_cmd_string(cmd->id), ret);
                 return ret;
         }
@@ -174,8 +174,9 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
         BUG_ON(cmd->meta.u.callback != NULL);
 
         if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) {
-                IWL_ERROR("Error sending %s: Already sending a host command\n",
-                          get_cmd_string(cmd->id));
+                IWL_ERR(priv,
+                        "Error sending %s: Already sending a host command\n",
+                        get_cmd_string(cmd->id));
                 ret = -EBUSY;
                 goto out;
         }
@@ -188,7 +189,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
         cmd_idx = iwl_enqueue_hcmd(priv, cmd);
         if (cmd_idx < 0) {
                 ret = cmd_idx;
-                IWL_ERROR("Error sending %s: enqueue_hcmd failed: %d\n",
+                IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
                           get_cmd_string(cmd->id), ret);
                 goto out;
         }
@@ -198,9 +199,10 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                         HOST_COMPLETE_TIMEOUT);
         if (!ret) {
                 if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
-                        IWL_ERROR("Error sending %s: time out after %dms.\n",
-                                  get_cmd_string(cmd->id),
-                                  jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
+                        IWL_ERR(priv,
+                                "Error sending %s: time out after %dms.\n",
+                                get_cmd_string(cmd->id),
+                                jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
 
                         clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
                         ret = -ETIMEDOUT;
@@ -221,7 +223,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                 goto fail;
         }
         if ((cmd->meta.flags & CMD_WANT_SKB) && !cmd->meta.u.skb) {
-                IWL_ERROR("Error: Response NULL in '%s'\n",
+                IWL_ERR(priv, "Error: Response NULL in '%s'\n",
                           get_cmd_string(cmd->id));
                 ret = -EIO;
                 goto cancel;