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, 47 insertions, 41 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ce290f6867f3..1ef9f58fec85 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -181,7 +181,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
 
         ret = iwl_agn_check_rxon_cmd(priv);
         if (ret) {
-                IWL_ERROR("Invalid RXON configuration.  Not committing.\n");
+                IWL_ERR(priv, "Invalid RXON configuration.  Not committing.\n");
                 return -EINVAL;
         }
 
@@ -191,7 +191,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
         if (!iwl_full_rxon_required(priv)) {
                 ret = iwl_send_rxon_assoc(priv);
                 if (ret) {
-                        IWL_ERROR("Error setting RXON_ASSOC (%d)\n", ret);
+                        IWL_ERR(priv, "Error setting RXON_ASSOC (%d)\n", ret);
                         return ret;
                 }
 
@@ -218,7 +218,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
                  * active_rxon back to what it was previously */
                 if (ret) {
                         active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
-                        IWL_ERROR("Error clearing ASSOC_MSK (%d)\n", ret);
+                        IWL_ERR(priv, "Error clearing ASSOC_MSK (%d)\n", ret);
                         return ret;
                 }
         }
@@ -242,7 +242,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
                 ret = iwl_send_cmd_pdu(priv, REPLY_RXON,
                               sizeof(struct iwl_rxon_cmd), &priv->staging_rxon);
                 if (ret) {
-                        IWL_ERROR("Error setting new RXON (%d)\n", ret);
+                        IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);
                         return ret;
                 }
                 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
@@ -256,7 +256,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
         /* Add the broadcast address so we can send broadcast frames */
         if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) ==
                                                 IWL_INVALID_STATION) {
-                IWL_ERROR("Error adding BROADCAST address for transmit.\n");
+                IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n");
                 return -EIO;
         }
 
@@ -267,13 +267,15 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
                         ret = iwl_rxon_add_station(priv,
                                            priv->active_rxon.bssid_addr, 1);
                         if (ret == IWL_INVALID_STATION) {
-                                IWL_ERROR("Error adding AP address for TX.\n");
+                                IWL_ERR(priv,
+                                        "Error adding AP address for TX.\n");
                                 return -EIO;
                         }
                         priv->assoc_station_added = 1;
                         if (priv->default_wep_key &&
                             iwl_send_static_wepkey_cmd(priv, 0))
-                                IWL_ERROR("Could not send WEP static key.\n");
+                                IWL_ERR(priv,
+                                        "Could not send WEP static key.\n");
                 }
 
                 /* Apply the new configuration
@@ -282,7 +284,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
                 ret = iwl_send_cmd_pdu(priv, REPLY_RXON,
                               sizeof(struct iwl_rxon_cmd), &priv->staging_rxon);
                 if (ret) {
-                        IWL_ERROR("Error setting new RXON (%d)\n", ret);
+                        IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);
                         return ret;
                 }
                 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
@@ -294,7 +296,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
          * send a new TXPOWER command or we won't be able to Tx any frames */
         ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
         if (ret) {
-                IWL_ERROR("Error sending TX power (%d)\n", ret);
+                IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
                 return ret;
         }
 
@@ -350,7 +352,7 @@ static struct iwl_frame *iwl_get_free_frame(struct iwl_priv *priv)
         if (list_empty(&priv->free_frames)) {
                 frame = kzalloc(sizeof(*frame), GFP_KERNEL);
                 if (!frame) {
-                        IWL_ERROR("Could not allocate frame!\n");
+                        IWL_ERR(priv, "Could not allocate frame!\n");
                         return NULL;
                 }
 
@@ -452,7 +454,7 @@ static int iwl_send_beacon_cmd(struct iwl_priv *priv)
         frame = iwl_get_free_frame(priv);
 
         if (!frame) {
-                IWL_ERROR("Could not obtain free frame buffer for beacon "
+                IWL_ERR(priv, "Could not obtain free frame buffer for beacon "
                           "command.\n");
                 return -ENOMEM;
         }
@@ -686,7 +688,7 @@ static void iwl_connection_init_rx_config(struct iwl_priv *priv, int mode)
                     RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
                 break;
         default:
-                IWL_ERROR("Unsupported interface type %d\n", mode);
+                IWL_ERR(priv, "Unsupported interface type %d\n", mode);
                 break;
         }
 
@@ -763,7 +765,7 @@ static void iwl_set_rate(struct iwl_priv *priv)
 
         hw = iwl_get_hw_mode(priv, priv->band);
         if (!hw) {
-                IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+                IWL_ERR(priv, "Failed to set rate: unable to get hw mode\n");
                 return;
         }
 
@@ -849,7 +851,7 @@ static void iwl_rx_reply_error(struct iwl_priv *priv,
 {
         struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
 
-        IWL_ERROR("Error Reply type 0x%08X cmd %s (0x%02X) "
+        IWL_ERR(priv, "Error Reply type 0x%08X cmd %s (0x%02X) "
                 "seq 0x%04X ser 0x%08X\n",
                 le32_to_cpu(pkt->u.err_resp.error_type),
                 get_cmd_string(pkt->u.err_resp.cmd_id),
@@ -902,7 +904,7 @@ static void iwl_bg_beacon_update(struct work_struct *work)
         beacon = ieee80211_beacon_get(priv->hw, priv->vif);
 
         if (!beacon) {
-                IWL_ERROR("update beacon failed\n");
+                IWL_ERR(priv, "update beacon failed\n");
                 return;
         }
 
@@ -1357,7 +1359,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
 
         /* Now service all interrupt bits discovered above. */
         if (inta & CSR_INT_BIT_HW_ERR) {
-                IWL_ERROR("Microcode HW error detected.  Restarting.\n");
+                IWL_ERR(priv, "Microcode HW error detected.  Restarting.\n");
 
                 /* Tell the device to stop sending interrupts */
                 iwl_disable_interrupts(priv);
@@ -1411,14 +1413,14 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
 
         /* Chip got too hot and stopped itself */
         if (inta & CSR_INT_BIT_CT_KILL) {
-                IWL_ERROR("Microcode CT kill error detected.\n");
+                IWL_ERR(priv, "Microcode CT kill error detected.\n");
                 handled |= CSR_INT_BIT_CT_KILL;
         }
 
         /* Error detected by uCode */
         if (inta & CSR_INT_BIT_SW_ERR) {
-                IWL_ERROR("Microcode SW error detected.  Restarting 0x%X.\n",
-                          inta);
+                IWL_ERR(priv, "Microcode SW error detected. "
+                        " Restarting 0x%X.\n", inta);
                 iwl_irq_handle_error(priv);
                 handled |= CSR_INT_BIT_SW_ERR;
         }
@@ -1454,7 +1456,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
         }
 
         if (inta & ~handled)
-                IWL_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
+                IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta & ~handled);
 
         if (inta & ~CSR_INI_SET_MASK) {
                 IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
@@ -1584,7 +1586,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
                 sprintf(buf, "%s%d%s", name_pre, index, ".ucode");
                 ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev);
                 if (ret < 0) {
-                        IWL_ERROR("%s firmware file req failed: Reason %d\n",
+                        IWL_ERR(priv, "%s firmware file req failed: %d\n",
                                   buf, ret);
                         if (ret == -ENOENT)
                                 continue;
@@ -1592,8 +1594,11 @@ static int iwl_read_ucode(struct iwl_priv *priv)
                                 goto error;
                 } else {
                         if (index < api_max)
-                                IWL_ERROR("Loaded firmware %s, which is deprecated. Please use API v%u instead.\n",
+                                IWL_ERR(priv, "Loaded firmware %s, "
+                                        "which is deprecated. "
+                                        "Please use API v%u instead.\n",
                                           buf, api_max);
+
                         IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n",
                                        buf, ucode_raw->size);
                         break;
@@ -1605,7 +1610,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 
         /* Make sure that we got at least our header! */
         if (ucode_raw->size < sizeof(*ucode)) {
-                IWL_ERROR("File size way too small!\n");
+                IWL_ERR(priv, "File size way too small!\n");
                 ret = -EINVAL;
                 goto err_release;
         }
@@ -1626,7 +1631,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
          * on the API version read from firware header from here on forward */
 
         if (api_ver < api_min || api_ver > api_max) {
-                IWL_ERROR("Driver unable to support your firmware API. "
+                IWL_ERR(priv, "Driver unable to support your firmware API. "
                           "Driver supports v%u, firmware is v%u.\n",
                           api_max, api_ver);
                 priv->ucode_ver = 0;
@@ -1787,7 +1792,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         return 0;
 
  err_pci_alloc:
-        IWL_ERROR("failed to allocate pci memory\n");
+        IWL_ERR(priv, "failed to allocate pci memory\n");
         ret = -ENOMEM;
         iwl_dealloc_ucode_pci(priv);
 
@@ -2025,7 +2030,7 @@ static int __iwl_up(struct iwl_priv *priv)
         }
 
         if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
-                IWL_ERROR("ucode not available for device bringup\n");
+                IWL_ERR(priv, "ucode not available for device bringup\n");
                 return -EIO;
         }
 
@@ -2046,7 +2051,7 @@ static int __iwl_up(struct iwl_priv *priv)
 
         ret = iwl_hw_nic_init(priv);
         if (ret) {
-                IWL_ERROR("Unable to init nic\n");
+                IWL_ERR(priv, "Unable to init nic\n");
                 return ret;
         }
 
@@ -2079,7 +2084,8 @@ static int __iwl_up(struct iwl_priv *priv)
                 ret = priv->cfg->ops->lib->load_ucode(priv);
 
                 if (ret) {
-                        IWL_ERROR("Unable to set up bootstrap uCode: %d\n", ret);
+                        IWL_ERR(priv, "Unable to set up bootstrap uCode: %d\n",
+                                ret);
                         continue;
                 }
 
@@ -2100,7 +2106,7 @@ static int __iwl_up(struct iwl_priv *priv)
 
         /* tried to restart and config the device for as long as our
          * patience could withstand */
-        IWL_ERROR("Unable to initialize device after %d attempts.\n", i);
+        IWL_ERR(priv, "Unable to initialize device after %d attempts.\n", i);
         return -EIO;
 }
 
@@ -2240,7 +2246,7 @@ static void iwl_post_associate(struct iwl_priv *priv)
         unsigned long flags;
 
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
-                IWL_ERROR("%s Should not be called in AP mode\n", __func__);
+                IWL_ERR(priv, "%s Should not be called in AP mode\n", __func__);
                 return;
         }
 
@@ -2313,7 +2319,7 @@ static void iwl_post_associate(struct iwl_priv *priv)
                 break;
 
         default:
-                IWL_ERROR("%s Should not be called in %d mode\n",
+                IWL_ERR(priv, "%s Should not be called in %d mode\n",
                           __func__, priv->iw_mode);
                 break;
         }
@@ -2354,7 +2360,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
         IWL_DEBUG_MAC80211("enter\n");
 
         if (pci_enable_device(priv->pci_dev)) {
-                IWL_ERROR("Fail to pci_enable_device\n");
+                IWL_ERR(priv, "Fail to pci_enable_device\n");
                 return -ENODEV;
         }
         pci_restore_state(priv->pci_dev);
@@ -2370,7 +2376,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
         ret = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
                           DRV_NAME, priv);
         if (ret) {
-                IWL_ERROR("Error allocating IRQ %d\n", priv->pci_dev->irq);
+                IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
                 goto out_disable_msi;
         }
 
@@ -2384,7 +2390,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
         if (!priv->ucode_code.len) {
                 ret = iwl_read_ucode(priv);
                 if (ret) {
-                        IWL_ERROR("Could not read microcode: %d\n", ret);
+                        IWL_ERR(priv, "Could not read microcode: %d\n", ret);
                         mutex_unlock(&priv->mutex);
                         goto out_release_irq;
                 }
@@ -2414,7 +2420,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
                         UCODE_READY_TIMEOUT);
         if (!ret) {
                 if (!test_bit(STATUS_READY, &priv->status)) {
-                        IWL_ERROR("START_ALIVE timeout after %dms.\n",
+                        IWL_ERR(priv, "START_ALIVE timeout after %dms.\n",
                                 jiffies_to_msecs(UCODE_READY_TIMEOUT));
                         ret = -ETIMEDOUT;
                         goto out_release_irq;
@@ -2573,7 +2579,7 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
 
         if (priv->iw_mode == NL80211_IFTYPE_ADHOC &&
             !is_channel_ibss(ch_info)) {
-                IWL_ERROR("channel %d in band %d not IBSS channel\n",
+                IWL_ERR(priv, "channel %d in band %d not IBSS channel\n",
                         conf->channel->hw_value, conf->channel->band);
                 ret = -EINVAL;
                 goto out;
@@ -3818,7 +3824,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* Read the EEPROM */
         err = iwl_eeprom_init(priv);
         if (err) {
-                IWL_ERROR("Unable to init EEPROM\n");
+                IWL_ERR(priv, "Unable to init EEPROM\n");
                 goto out_iounmap;
         }
         err = iwl_eeprom_check_version(priv);
@@ -3834,7 +3840,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
          * 5. Setup HW constants
          ************************/
         if (iwl_set_hw_params(priv)) {
-                IWL_ERROR("failed to set hw parameters\n");
+                IWL_ERR(priv, "failed to set hw parameters\n");
                 goto out_free_eeprom;
         }
 
@@ -3866,7 +3872,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         err = sysfs_create_group(&pdev->dev.kobj, &iwl_attribute_group);
         if (err) {
-                IWL_ERROR("failed to create sysfs device attributes\n");
+                IWL_ERR(priv, "failed to create sysfs device attributes\n");
                 goto out_uninit_drv;
         }
 
@@ -3890,11 +3896,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         err = iwl_dbgfs_register(priv, DRV_NAME);
         if (err)
-                IWL_ERROR("failed to create debugfs files\n");
+                IWL_ERR(priv, "failed to create debugfs files\n");
 
         err = iwl_rfkill_init(priv);
         if (err)
-                IWL_ERROR("Unable to initialize RFKILL system. "
+                IWL_ERR(priv, "Unable to initialize RFKILL system. "
                                   "Ignoring error: %d\n", err);
         iwl_power_initialize(priv);
         return 0;