Skip to content

L
linux
Commit 15b1687c authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files
Options

iwlwifi: replace IWL_ERROR with IWL_ERR 

IWL_ERR doesn't use hidden priv pointer.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 39aadf8c
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 272 deletions
drivers/net/wireless/iwlwifi/iwl-3945-led.c
View file @ 15b1687c
...@@ -216,7 +216,7 @@ static int iwl3945_led_register_led(struct iwl_priv *priv, ...@@ -216,7 +216,7 @@ static int iwl3945_led_register_led(struct iwl_priv *priv,
ret = led_classdev_register(device, &led->led_dev); ret = led_classdev_register(device, &led->led_dev);
if (ret) { if (ret) {
IWL_ERROR("Error: failed to register led handler.\n"); IWL_ERR(priv, "Error: failed to register led handler.\n");
return ret; return ret;
} }
......
drivers/net/wireless/iwlwifi/iwl-3945.c
View file @ 15b1687c
...@@ -152,7 +152,7 @@ void iwl3945_disable_events(struct iwl_priv *priv) ...@@ -152,7 +152,7 @@ void iwl3945_disable_events(struct iwl_priv *priv)
base = le32_to_cpu(priv->card_alive.log_event_table_ptr); base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
if (!iwl3945_hw_valid_rtc_data_addr(base)) { if (!iwl3945_hw_valid_rtc_data_addr(base)) {
IWL_ERROR("Invalid event log pointer 0x%08X\n", base); IWL_ERR(priv, "Invalid event log pointer 0x%08X\n", base);
return; return;
} }
...@@ -224,7 +224,7 @@ __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv) ...@@ -224,7 +224,7 @@ __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv)
} }
/* bad antenna selector value */ /* bad antenna selector value */
IWL_ERROR("Bad antenna selector value (0x%x)\n", priv->antenna); IWL_ERR(priv, "Bad antenna selector value (0x%x)\n", priv->antenna);
return 0; /* "diversity" is default if error */ return 0; /* "diversity" is default if error */
} }
...@@ -344,7 +344,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv, ...@@ -344,7 +344,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
int fail; int fail;
if ((index >= txq->q.n_bd) || (iwl3945_x2_queue_used(&txq->q, index) == 0)) { if ((index >= txq->q.n_bd) || (iwl3945_x2_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, "is out of range [0-%d] %d %d\n", txq_id,
index, txq->q.n_bd, txq->q.write_ptr, index, txq->q.n_bd, txq->q.write_ptr,
txq->q.read_ptr); txq->q.read_ptr);
...@@ -376,7 +376,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv, ...@@ -376,7 +376,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
iwl3945_tx_queue_reclaim(priv, txq_id, index); iwl3945_tx_queue_reclaim(priv, txq_id, index);
if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) 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");
} }
...@@ -734,7 +734,7 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr, ...@@ -734,7 +734,7 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,
pad = TFD_CTL_PAD_GET(le32_to_cpu(tfd->control_flags)); pad = TFD_CTL_PAD_GET(le32_to_cpu(tfd->control_flags));
if ((count >= NUM_TFD_CHUNKS) || (count < 0)) { if ((count >= NUM_TFD_CHUNKS) || (count < 0)) {
IWL_ERROR("Error can not send more than %d chunks\n", IWL_ERR(priv, "Error can not send more than %d chunks\n",
NUM_TFD_CHUNKS); NUM_TFD_CHUNKS);
return -EINVAL; return -EINVAL;
} }
...@@ -771,7 +771,7 @@ int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl3945_tx_queue *txq) ...@@ -771,7 +771,7 @@ int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl3945_tx_queue *txq)
/* sanity check */ /* sanity check */
counter = TFD_CTL_COUNT_GET(le32_to_cpu(bd->control_flags)); counter = TFD_CTL_COUNT_GET(le32_to_cpu(bd->control_flags));
if (counter > NUM_TFD_CHUNKS) { if (counter > NUM_TFD_CHUNKS) {
IWL_ERROR("Too many chunks: %i\n", counter); IWL_ERR(priv, "Too many chunks: %i\n", counter);
/* @todo issue fatal error, it is quite serious situation */ /* @todo issue fatal error, it is quite serious situation */
return 0; return 0;
} }
...@@ -1065,7 +1065,7 @@ static int iwl3945_txq_ctx_reset(struct iwl_priv *priv) ...@@ -1065,7 +1065,7 @@ static int iwl3945_txq_ctx_reset(struct iwl_priv *priv)
rc = iwl3945_tx_queue_init(priv, &priv->txq39[txq_id], slots_num, rc = iwl3945_tx_queue_init(priv, &priv->txq39[txq_id], slots_num,
txq_id); txq_id);
if (rc) { if (rc) {
IWL_ERROR("Tx %d queue init failed\n", txq_id); IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);
goto error; goto error;
} }
} }
...@@ -1177,7 +1177,7 @@ int iwl3945_hw_nic_init(struct iwl_priv *priv) ...@@ -1177,7 +1177,7 @@ int iwl3945_hw_nic_init(struct iwl_priv *priv)
if (!rxq->bd) { if (!rxq->bd) {
rc = iwl3945_rx_queue_alloc(priv); rc = iwl3945_rx_queue_alloc(priv);
if (rc) { if (rc) {
IWL_ERROR("Unable to initialize Rx queue\n"); IWL_ERR(priv, "Unable to initialize Rx queue\n");
return -ENOMEM; return -ENOMEM;
} }
} else } else
...@@ -1377,7 +1377,7 @@ static int iwl3945_hw_reg_txpower_get_temperature(struct iwl_priv *priv) ...@@ -1377,7 +1377,7 @@ static int iwl3945_hw_reg_txpower_get_temperature(struct iwl_priv *priv)
/* handle insane temp reading */ /* handle insane temp reading */
if (iwl3945_hw_reg_temp_out_of_range(temperature)) { if (iwl3945_hw_reg_temp_out_of_range(temperature)) {
IWL_ERROR("Error bad temperature value %d\n", temperature); IWL_ERR(priv, "Error bad temperature value %d\n", temperature);
/* if really really hot(?), /* if really really hot(?),
* substitute the 3rd band/group's temp measured at factory */ * substitute the 3rd band/group's temp measured at factory */
...@@ -1685,9 +1685,9 @@ int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv) ...@@ -1685,9 +1685,9 @@ int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv)
priv->band, priv->band,
le16_to_cpu(priv->active39_rxon.channel)); le16_to_cpu(priv->active39_rxon.channel));
if (!ch_info) { if (!ch_info) {
IWL_ERROR IWL_ERR(priv,
("Failed to get channel info for channel %d [%d]\n", "Failed to get channel info for channel %d [%d]\n",
le16_to_cpu(priv->active39_rxon.channel), priv->band); le16_to_cpu(priv->active39_rxon.channel), priv->band);
return -EINVAL; return -EINVAL;
} }
...@@ -2224,7 +2224,7 @@ int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv) ...@@ -2224,7 +2224,7 @@ int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)
ch_info->group_index, ch_info->group_index,
&power_idx); &power_idx);
if (rc) { if (rc) {
IWL_ERROR("Invalid power index\n"); IWL_ERR(priv, "Invalid power index\n");
return rc; return rc;
} }
pwr_info->base_power_index = (u8) power_idx; pwr_info->base_power_index = (u8) power_idx;
...@@ -2300,7 +2300,7 @@ int iwl3945_hw_rxq_stop(struct iwl_priv *priv) ...@@ -2300,7 +2300,7 @@ int iwl3945_hw_rxq_stop(struct iwl_priv *priv)
rc = iwl_poll_direct_bit(priv, FH39_RSSR_STATUS, rc = iwl_poll_direct_bit(priv, FH39_RSSR_STATUS,
FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000); FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
if (rc < 0) if (rc < 0)
IWL_ERROR("Can't stop Rx DMA.\n"); IWL_ERR(priv, "Can't stop Rx DMA.\n");
iwl_release_nic_access(priv); iwl_release_nic_access(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
...@@ -2440,7 +2440,7 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv) ...@@ -2440,7 +2440,7 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv)
&priv->shared_phys); &priv->shared_phys);
if (!priv->shared_virt) { if (!priv->shared_virt) {
IWL_ERROR("failed to allocate pci memory\n"); IWL_ERR(priv, "failed to allocate pci memory\n");
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
return -ENOMEM; return -ENOMEM;
} }
......
drivers/net/wireless/iwlwifi/iwl-4965.c
View file @ 15b1687c
...@@ -85,7 +85,7 @@ static int iwl4965_verify_bsm(struct iwl_priv *priv) ...@@ -85,7 +85,7 @@ static int iwl4965_verify_bsm(struct iwl_priv *priv)
reg += sizeof(u32), image++) { reg += sizeof(u32), image++) {
val = iwl_read_prph(priv, reg); val = iwl_read_prph(priv, reg);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image)) {
IWL_ERROR("BSM uCode verification failed at " IWL_ERR(priv, "BSM uCode verification failed at "
"addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n", "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
BSM_SRAM_LOWER_BOUND, BSM_SRAM_LOWER_BOUND,
reg - BSM_SRAM_LOWER_BOUND, len, reg - BSM_SRAM_LOWER_BOUND, len,
...@@ -203,7 +203,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) ...@@ -203,7 +203,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv)
if (i < 100) if (i < 100)
IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i); IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i);
else { else {
IWL_ERROR("BSM write did not complete!\n"); IWL_ERR(priv, "BSM write did not complete!\n");
return -EIO; return -EIO;
} }
...@@ -523,7 +523,8 @@ static void iwl4965_chain_noise_reset(struct iwl_priv *priv) ...@@ -523,7 +523,8 @@ static void iwl4965_chain_noise_reset(struct iwl_priv *priv)
cmd.diff_gain_c = 0; cmd.diff_gain_c = 0;
if (iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD, if (iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
sizeof(cmd), &cmd)) sizeof(cmd), &cmd))
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; data->state = IWL_CHAIN_NOISE_ACCUMULATE;
IWL_DEBUG_CALIB("Run chain_noise_calibrate\n"); IWL_DEBUG_CALIB("Run chain_noise_calibrate\n");
} }
...@@ -804,8 +805,9 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) ...@@ -804,8 +805,9 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv)
if ((priv->cfg->mod_params->num_of_queues > IWL49_NUM_QUEUES) || if ((priv->cfg->mod_params->num_of_queues > IWL49_NUM_QUEUES) ||
(priv->cfg->mod_params->num_of_queues < IWL_MIN_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_ERR(priv,
IWL_MIN_NUM_QUEUES, IWL49_NUM_QUEUES); "invalid queues_num, should be between %d and %d\n",
IWL_MIN_NUM_QUEUES, IWL49_NUM_QUEUES);
return -EINVAL; return -EINVAL;
} }
...@@ -955,7 +957,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel, ...@@ -955,7 +957,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,
s = iwl4965_get_sub_band(priv, channel); s = iwl4965_get_sub_band(priv, channel);
if (s >= EEPROM_TX_POWER_BANDS) { if (s >= EEPROM_TX_POWER_BANDS) {
IWL_ERROR("Tx Power can not find channel %d\n", channel); IWL_ERR(priv, "Tx Power can not find channel %d\n", channel);
return -1; return -1;
} }
...@@ -1319,7 +1321,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, ...@@ -1319,7 +1321,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
* and 2) mimo txpower balance between Tx chains. */ * and 2) mimo txpower balance between Tx chains. */
txatten_grp = iwl4965_get_tx_atten_grp(channel); txatten_grp = iwl4965_get_tx_atten_grp(channel);
if (txatten_grp < 0) { if (txatten_grp < 0) {
IWL_ERROR("Can't find txatten group for channel %d.\n", IWL_ERR(priv, "Can't find txatten group for channel %d.\n",
channel); channel);
return -EINVAL; return -EINVAL;
} }
...@@ -1727,7 +1729,7 @@ static int iwl4965_hw_get_temperature(const struct iwl_priv *priv) ...@@ -1727,7 +1729,7 @@ static int iwl4965_hw_get_temperature(const struct iwl_priv *priv)
IWL_DEBUG_TEMP("Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt); IWL_DEBUG_TEMP("Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);
if (R3 == R1) { if (R3 == R1) {
IWL_ERROR("Calibration conflict R1 == R3\n"); IWL_ERR(priv, "Calibration conflict R1 == R3\n");
return -1; return -1;
} }
...@@ -2071,10 +2073,10 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, ...@@ -2071,10 +2073,10 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv,
sc = le16_to_cpu(hdr->seq_ctrl); sc = le16_to_cpu(hdr->seq_ctrl);
if (idx != (SEQ_TO_SN(sc) & 0xff)) { if (idx != (SEQ_TO_SN(sc) & 0xff)) {
IWL_ERROR("BUG_ON idx doesn't match seq control" IWL_ERR(priv,
" idx=%d, seq_idx=%d, seq=%d\n", "BUG_ON idx doesn't match seq control"
idx, SEQ_TO_SN(sc), " idx=%d, seq_idx=%d, seq=%d\n",
hdr->seq_ctrl); idx, SEQ_TO_SN(sc), hdr->seq_ctrl);
return -1; return -1;
} }
...@@ -2133,7 +2135,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, ...@@ -2133,7 +2135,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
u8 *qc = NULL; u8 *qc = NULL;
if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) { 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, "is out of range [0-%d] %d %d\n", txq_id,
index, txq->q.n_bd, txq->q.write_ptr, index, txq->q.n_bd, txq->q.write_ptr,
txq->q.read_ptr); txq->q.read_ptr);
...@@ -2151,7 +2153,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, ...@@ -2151,7 +2153,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
sta_id = iwl_get_ra_sta_id(priv, hdr); sta_id = iwl_get_ra_sta_id(priv, hdr);
if (txq->sched_retry && unlikely(sta_id == IWL_INVALID_STATION)) { if (txq->sched_retry && unlikely(sta_id == IWL_INVALID_STATION)) {
IWL_ERROR("Station not known\n"); IWL_ERR(priv, "Station not known\n");
return; return;
} }
...@@ -2214,7 +2216,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, ...@@ -2214,7 +2216,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
iwl_txq_check_empty(priv, sta_id, tid, txq_id); iwl_txq_check_empty(priv, sta_id, tid, txq_id);
if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) 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");
} }
static int iwl4965_calc_rssi(struct iwl_priv *priv, static int iwl4965_calc_rssi(struct iwl_priv *priv,
......
drivers/net/wireless/iwlwifi/iwl-5000.c
View file @ 15b1687c
...@@ -289,7 +289,7 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address) ...@@ -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); offset = iwl_eeprom_query16(priv, EEPROM_5000_LINK_OTHERS);
break; break;
default: default:
IWL_ERROR("illegal indirect type: 0x%X\n", IWL_ERR(priv, "illegal indirect type: 0x%X\n",
address & INDIRECT_TYPE_MSK); address & INDIRECT_TYPE_MSK);
break; break;
} }
...@@ -384,7 +384,8 @@ static void iwl5000_chain_noise_reset(struct iwl_priv *priv) ...@@ -384,7 +384,8 @@ static void iwl5000_chain_noise_reset(struct iwl_priv *priv)
ret = iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD, ret = iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
sizeof(cmd), &cmd); sizeof(cmd), &cmd);
if (ret) 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; data->state = IWL_CHAIN_NOISE_ACCUMULATE;
IWL_DEBUG_CALIB("Run chain_noise_calibrate\n"); IWL_DEBUG_CALIB("Run chain_noise_calibrate\n");
} }
...@@ -507,7 +508,7 @@ static void iwl5000_rx_calib_result(struct iwl_priv *priv, ...@@ -507,7 +508,7 @@ static void iwl5000_rx_calib_result(struct iwl_priv *priv,
index = IWL_CALIB_BASE_BAND; index = IWL_CALIB_BASE_BAND;
break; break;
default: default:
IWL_ERROR("Unknown calibration notification %d\n", IWL_ERR(priv, "Unknown calibration notification %d\n",
hdr->op_code); hdr->op_code);
return; return;
} }
...@@ -589,12 +590,12 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv, ...@@ -589,12 +590,12 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv,
ret = wait_event_interruptible_timeout(priv->wait_command_queue, ret = wait_event_interruptible_timeout(priv->wait_command_queue,
priv->ucode_write_complete, 5 * HZ); priv->ucode_write_complete, 5 * HZ);
if (ret == -ERESTARTSYS) { 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"); "to interrupt\n");
return ret; return ret;
} }
if (!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; return -ETIMEDOUT;
} }
...@@ -610,11 +611,11 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv, ...@@ -610,11 +611,11 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv,
ret = wait_event_interruptible_timeout(priv->wait_command_queue, ret = wait_event_interruptible_timeout(priv->wait_command_queue,
priv->ucode_write_complete, 5 * HZ); priv->ucode_write_complete, 5 * HZ);
if (ret == -ERESTARTSYS) { 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"); "to interrupt\n");
return ret; return ret;
} else if (!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; return -ETIMEDOUT;
} else } else
ret = 0; ret = 0;
...@@ -826,8 +827,9 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -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) || if ((priv->cfg->mod_params->num_of_queues > IWL50_NUM_QUEUES) ||
(priv->cfg->mod_params->num_of_queues < IWL_MIN_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_ERR(priv,
IWL_MIN_NUM_QUEUES, IWL50_NUM_QUEUES); "invalid queues_num, should be between %d and %d\n",
IWL_MIN_NUM_QUEUES, IWL50_NUM_QUEUES);
return -EINVAL; return -EINVAL;
} }
...@@ -1201,8 +1203,9 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv, ...@@ -1201,8 +1203,9 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv,
sc = le16_to_cpu(hdr->seq_ctrl); sc = le16_to_cpu(hdr->seq_ctrl);
if (idx != (SEQ_TO_SN(sc) & 0xff)) { if (idx != (SEQ_TO_SN(sc) & 0xff)) {
IWL_ERROR("BUG_ON idx doesn't match seq control" IWL_ERR(priv,
" idx=%d, seq_idx=%d, seq=%d\n", "BUG_ON idx doesn't match seq control"
" idx=%d, seq_idx=%d, seq=%d\n",
idx, SEQ_TO_SN(sc), idx, SEQ_TO_SN(sc),
hdr->seq_ctrl); hdr->seq_ctrl);
return -1; return -1;
...@@ -1258,7 +1261,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, ...@@ -1258,7 +1261,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv,
int freed; int freed;
if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) { 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, "is out of range [0-%d] %d %d\n", txq_id,
index, txq->q.n_bd, txq->q.write_ptr, index, txq->q.n_bd, txq->q.write_ptr,
txq->q.read_ptr); txq->q.read_ptr);
...@@ -1332,7 +1335,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, ...@@ -1332,7 +1335,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv,
iwl_txq_check_empty(priv, sta_id, tid, txq_id); iwl_txq_check_empty(priv, sta_id, tid, txq_id);
if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) 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 */ /* Currently 5000 is the superset of everything */
......
drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c
View file @ 15b1687c
...@@ -101,7 +101,7 @@ int iwl_agn_check_rxon_cmd(struct iwl_priv *priv) ...@@ -101,7 +101,7 @@ int iwl_agn_check_rxon_cmd(struct iwl_priv *priv)
le16_to_cpu(rxon->channel)); le16_to_cpu(rxon->channel));
if (error) { if (error) {
IWL_ERROR("Not a valid iwl4965_rxon_assoc_cmd field values\n"); IWL_ERR(priv, "Not a valid iwl_rxon_assoc_cmd field values\n");
return -1; return -1;
} }
return 0; return 0;
......
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
View file @ 15b1687c
...@@ -1431,7 +1431,8 @@ static int rs_move_siso_to_other(struct iwl_priv *priv, ...@@ -1431,7 +1431,8 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
if (!tbl->is_SGI) if (!tbl->is_SGI)
break; break;
else else
IWL_ERROR("SGI was set in GF+SISO\n"); IWL_ERR(priv,
"SGI was set in GF+SISO\n");
} }
search_tbl->is_SGI = !tbl->is_SGI; search_tbl->is_SGI = !tbl->is_SGI;
rs_set_expected_tpt_table(lq_sta, search_tbl); rs_set_expected_tpt_table(lq_sta, search_tbl);
...@@ -1748,13 +1749,13 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, ...@@ -1748,13 +1749,13 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,
rate_scale_index_msk = rate_mask; rate_scale_index_msk = rate_mask;
if (!((1 << index) & rate_scale_index_msk)) { if (!((1 << index) & rate_scale_index_msk)) {
IWL_ERROR("Current Rate is not valid\n"); IWL_ERR(priv, "Current Rate is not valid\n");
return; return;
} }
/* Get expected throughput table and history window for current rate */ /* Get expected throughput table and history window for current rate */
if (!tbl->expected_tpt) { if (!tbl->expected_tpt) {
IWL_ERROR("tbl->expected_tpt is NULL\n"); IWL_ERR(priv, "tbl->expected_tpt is NULL\n");
return; return;
} }
......
drivers/net/wireless/iwlwifi/iwl-agn.c
View file @ 15b1687c
...@@ -181,7 +181,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -181,7 +181,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
ret = iwl_agn_check_rxon_cmd(priv); ret = iwl_agn_check_rxon_cmd(priv);
if (ret) { if (ret) {
IWL_ERROR("Invalid RXON configuration. Not committing.\n"); IWL_ERR(priv, "Invalid RXON configuration. Not committing.\n");
return -EINVAL; return -EINVAL;
} }
...@@ -191,7 +191,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -191,7 +191,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
if (!iwl_full_rxon_required(priv)) { if (!iwl_full_rxon_required(priv)) {
ret = iwl_send_rxon_assoc(priv); ret = iwl_send_rxon_assoc(priv);
if (ret) { if (ret) {
IWL_ERROR("Error setting RXON_ASSOC (%d)\n", ret); IWL_ERR(priv, "Error setting RXON_ASSOC (%d)\n", ret);
return ret; return ret;
} }
...@@ -218,7 +218,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -218,7 +218,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
* active_rxon back to what it was previously */ * active_rxon back to what it was previously */
if (ret) { if (ret) {
active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK; 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; return ret;
} }
} }
...@@ -242,7 +242,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -242,7 +242,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
ret = iwl_send_cmd_pdu(priv, REPLY_RXON, ret = iwl_send_cmd_pdu(priv, REPLY_RXON,
sizeof(struct iwl_rxon_cmd), &priv->staging_rxon); sizeof(struct iwl_rxon_cmd), &priv->staging_rxon);
if (ret) { if (ret) {
IWL_ERROR("Error setting new RXON (%d)\n", ret); IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);
return ret; return ret;
} }
memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
...@@ -256,7 +256,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -256,7 +256,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
/* Add the broadcast address so we can send broadcast frames */ /* Add the broadcast address so we can send broadcast frames */
if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) == if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) ==
IWL_INVALID_STATION) { IWL_INVALID_STATION) {
IWL_ERROR("Error adding BROADCAST address for transmit.\n"); IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n");
return -EIO; return -EIO;
} }
...@@ -267,13 +267,15 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -267,13 +267,15 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
ret = iwl_rxon_add_station(priv, ret = iwl_rxon_add_station(priv,
priv->active_rxon.bssid_addr, 1); priv->active_rxon.bssid_addr, 1);
if (ret == IWL_INVALID_STATION) { 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; return -EIO;
} }
priv->assoc_station_added = 1; priv->assoc_station_added = 1;
if (priv->default_wep_key && if (priv->default_wep_key &&
iwl_send_static_wepkey_cmd(priv, 0)) 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 /* Apply the new configuration
...@@ -282,7 +284,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -282,7 +284,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
ret = iwl_send_cmd_pdu(priv, REPLY_RXON, ret = iwl_send_cmd_pdu(priv, REPLY_RXON,
sizeof(struct iwl_rxon_cmd), &priv->staging_rxon); sizeof(struct iwl_rxon_cmd), &priv->staging_rxon);
if (ret) { if (ret) {
IWL_ERROR("Error setting new RXON (%d)\n", ret); IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);
return ret; return ret;
} }
memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
...@@ -294,7 +296,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv) ...@@ -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 */ * 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); ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
if (ret) { if (ret) {
IWL_ERROR("Error sending TX power (%d)\n", ret); IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
return ret; return ret;
} }
...@@ -350,7 +352,7 @@ static struct iwl_frame *iwl_get_free_frame(struct iwl_priv *priv) ...@@ -350,7 +352,7 @@ static struct iwl_frame *iwl_get_free_frame(struct iwl_priv *priv)
if (list_empty(&priv->free_frames)) { if (list_empty(&priv->free_frames)) {
frame = kzalloc(sizeof(*frame), GFP_KERNEL); frame = kzalloc(sizeof(*frame), GFP_KERNEL);
if (!frame) { if (!frame) {
IWL_ERROR("Could not allocate frame!\n"); IWL_ERR(priv, "Could not allocate frame!\n");
return NULL; return NULL;
} }
...@@ -452,7 +454,7 @@ static int iwl_send_beacon_cmd(struct iwl_priv *priv) ...@@ -452,7 +454,7 @@ static int iwl_send_beacon_cmd(struct iwl_priv *priv)
frame = iwl_get_free_frame(priv); frame = iwl_get_free_frame(priv);
if (!frame) { 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"); "command.\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -686,7 +688,7 @@ static void iwl_connection_init_rx_config(struct iwl_priv *priv, int mode) ...@@ -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; RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
break; break;
default: default:
IWL_ERROR("Unsupported interface type %d\n", mode); IWL_ERR(priv, "Unsupported interface type %d\n", mode);
break; break;
} }
...@@ -763,7 +765,7 @@ static void iwl_set_rate(struct iwl_priv *priv) ...@@ -763,7 +765,7 @@ static void iwl_set_rate(struct iwl_priv *priv)
hw = iwl_get_hw_mode(priv, priv->band); hw = iwl_get_hw_mode(priv, priv->band);
if (!hw) { 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; return;
} }
...@@ -849,7 +851,7 @@ static void iwl_rx_reply_error(struct iwl_priv *priv, ...@@ -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; 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", "seq 0x%04X ser 0x%08X\n",
le32_to_cpu(pkt->u.err_resp.error_type), le32_to_cpu(pkt->u.err_resp.error_type),
get_cmd_string(pkt->u.err_resp.cmd_id), get_cmd_string(pkt->u.err_resp.cmd_id),
...@@ -902,7 +904,7 @@ static void iwl_bg_beacon_update(struct work_struct *work) ...@@ -902,7 +904,7 @@ static void iwl_bg_beacon_update(struct work_struct *work)
beacon = ieee80211_beacon_get(priv->hw, priv->vif); beacon = ieee80211_beacon_get(priv->hw, priv->vif);
if (!beacon) { if (!beacon) {
IWL_ERROR("update beacon failed\n"); IWL_ERR(priv, "update beacon failed\n");
return; return;
} }
...@@ -1357,7 +1359,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) ...@@ -1357,7 +1359,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
/* Now service all interrupt bits discovered above. */ /* Now service all interrupt bits discovered above. */
if (inta & CSR_INT_BIT_HW_ERR) { 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 */ /* Tell the device to stop sending interrupts */
iwl_disable_interrupts(priv); iwl_disable_interrupts(priv);
...@@ -1411,14 +1413,14 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) ...@@ -1411,14 +1413,14 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
/* Chip got too hot and stopped itself */ /* Chip got too hot and stopped itself */
if (inta & CSR_INT_BIT_CT_KILL) { 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; handled |= CSR_INT_BIT_CT_KILL;
} }
/* Error detected by uCode */ /* Error detected by uCode */
if (inta & CSR_INT_BIT_SW_ERR) { if (inta & CSR_INT_BIT_SW_ERR) {
IWL_ERROR("Microcode SW error detected. Restarting 0x%X.\n", IWL_ERR(priv, "Microcode SW error detected. "
inta); " Restarting 0x%X.\n", inta);
iwl_irq_handle_error(priv); iwl_irq_handle_error(priv);
handled |= CSR_INT_BIT_SW_ERR; handled |= CSR_INT_BIT_SW_ERR;
} }
...@@ -1454,7 +1456,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) ...@@ -1454,7 +1456,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
} }
if (inta & ~handled) 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) { if (inta & ~CSR_INI_SET_MASK) {
IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n", IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
...@@ -1584,7 +1586,7 @@ static int iwl_read_ucode(struct iwl_priv *priv) ...@@ -1584,7 +1586,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
sprintf(buf, "%s%d%s", name_pre, index, ".ucode"); sprintf(buf, "%s%d%s", name_pre, index, ".ucode");
ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev); ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev);
if (ret < 0) { 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); buf, ret);
if (ret == -ENOENT) if (ret == -ENOENT)
continue; continue;
...@@ -1592,8 +1594,11 @@ static int iwl_read_ucode(struct iwl_priv *priv) ...@@ -1592,8 +1594,11 @@ static int iwl_read_ucode(struct iwl_priv *priv)
goto error; goto error;
} else { } else {
if (index < api_max) 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); buf, api_max);
IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n", IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n",
buf, ucode_raw->size); buf, ucode_raw->size);
break; break;
...@@ -1605,7 +1610,7 @@ static int iwl_read_ucode(struct iwl_priv *priv) ...@@ -1605,7 +1610,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
/* Make sure that we got at least our header! */ /* Make sure that we got at least our header! */
if (ucode_raw->size < sizeof(*ucode)) { 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; ret = -EINVAL;
goto err_release; goto err_release;
} }
...@@ -1626,7 +1631,7 @@ static int iwl_read_ucode(struct iwl_priv *priv) ...@@ -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 */ * on the API version read from firware header from here on forward */
if (api_ver < api_min || api_ver > api_max) { 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", "Driver supports v%u, firmware is v%u.\n",
api_max, api_ver); api_max, api_ver);
priv->ucode_ver = 0; priv->ucode_ver = 0;
...@@ -1787,7 +1792,7 @@ static int iwl_read_ucode(struct iwl_priv *priv) ...@@ -1787,7 +1792,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
return 0; return 0;
err_pci_alloc: err_pci_alloc:
IWL_ERROR("failed to allocate pci memory\n"); IWL_ERR(priv, "failed to allocate pci memory\n");
ret = -ENOMEM; ret = -ENOMEM;
iwl_dealloc_ucode_pci(priv); iwl_dealloc_ucode_pci(priv);
...@@ -2025,7 +2030,7 @@ static int __iwl_up(struct iwl_priv *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) { 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; return -EIO;
} }
...@@ -2046,7 +2051,7 @@ static int __iwl_up(struct iwl_priv *priv) ...@@ -2046,7 +2051,7 @@ static int __iwl_up(struct iwl_priv *priv)
ret = iwl_hw_nic_init(priv); ret = iwl_hw_nic_init(priv);
if (ret) { if (ret) {
IWL_ERROR("Unable to init nic\n"); IWL_ERR(priv, "Unable to init nic\n");
return ret; return ret;
} }
...@@ -2079,7 +2084,8 @@ static int __iwl_up(struct iwl_priv *priv) ...@@ -2079,7 +2084,8 @@ static int __iwl_up(struct iwl_priv *priv)
ret = priv->cfg->ops->lib->load_ucode(priv); ret = priv->cfg->ops->lib->load_ucode(priv);
if (ret) { 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; continue;
} }
...@@ -2100,7 +2106,7 @@ static int __iwl_up(struct iwl_priv *priv) ...@@ -2100,7 +2106,7 @@ static int __iwl_up(struct iwl_priv *priv)
/* tried to restart and config the device for as long as our /* tried to restart and config the device for as long as our
* patience could withstand */ * 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; return -EIO;
} }
...@@ -2240,7 +2246,7 @@ static void iwl_post_associate(struct iwl_priv *priv) ...@@ -2240,7 +2246,7 @@ static void iwl_post_associate(struct iwl_priv *priv)
unsigned long flags; unsigned long flags;
if (priv->iw_mode == NL80211_IFTYPE_AP) { 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; return;
} }
...@@ -2313,7 +2319,7 @@ static void iwl_post_associate(struct iwl_priv *priv) ...@@ -2313,7 +2319,7 @@ static void iwl_post_associate(struct iwl_priv *priv)
break; break;
default: 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); __func__, priv->iw_mode);
break; break;
} }
...@@ -2354,7 +2360,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw) ...@@ -2354,7 +2360,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
if (pci_enable_device(priv->pci_dev)) { 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; return -ENODEV;
} }
pci_restore_state(priv->pci_dev); pci_restore_state(priv->pci_dev);
...@@ -2370,7 +2376,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw) ...@@ -2370,7 +2376,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
ret = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED, ret = request_irq(priv->pci_dev->irq, iwl_isr, IRQF_SHARED,
DRV_NAME, priv); DRV_NAME, priv);
if (ret) { 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; goto out_disable_msi;
} }
...@@ -2384,7 +2390,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw) ...@@ -2384,7 +2390,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
if (!priv->ucode_code.len) { if (!priv->ucode_code.len) {
ret = iwl_read_ucode(priv); ret = iwl_read_ucode(priv);
if (ret) { 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); mutex_unlock(&priv->mutex);
goto out_release_irq; goto out_release_irq;
} }
...@@ -2414,7 +2420,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw) ...@@ -2414,7 +2420,7 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
UCODE_READY_TIMEOUT); UCODE_READY_TIMEOUT);
if (!ret) { if (!ret) {
if (!test_bit(STATUS_READY, &priv->status)) { 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)); jiffies_to_msecs(UCODE_READY_TIMEOUT));
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out_release_irq; goto out_release_irq;
...@@ -2573,7 +2579,7 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) ...@@ -2573,7 +2579,7 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
if (priv->iw_mode == NL80211_IFTYPE_ADHOC && if (priv->iw_mode == NL80211_IFTYPE_ADHOC &&
!is_channel_ibss(ch_info)) { !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); conf->channel->hw_value, conf->channel->band);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
...@@ -3818,7 +3824,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3818,7 +3824,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Read the EEPROM */ /* Read the EEPROM */
err = iwl_eeprom_init(priv); err = iwl_eeprom_init(priv);
if (err) { if (err) {
IWL_ERROR("Unable to init EEPROM\n"); IWL_ERR(priv, "Unable to init EEPROM\n");
goto out_iounmap; goto out_iounmap;
} }
err = iwl_eeprom_check_version(priv); 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) ...@@ -3834,7 +3840,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* 5. Setup HW constants * 5. Setup HW constants
************************/ ************************/
if (iwl_set_hw_params(priv)) { 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; goto out_free_eeprom;
} }
...@@ -3866,7 +3872,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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); err = sysfs_create_group(&pdev->dev.kobj, &iwl_attribute_group);
if (err) { 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; goto out_uninit_drv;
} }
...@@ -3890,11 +3896,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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); err = iwl_dbgfs_register(priv, DRV_NAME);
if (err) if (err)
IWL_ERROR("failed to create debugfs files\n"); IWL_ERR(priv, "failed to create debugfs files\n");
err = iwl_rfkill_init(priv); err = iwl_rfkill_init(priv);
if (err) if (err)
IWL_ERROR("Unable to initialize RFKILL system. " IWL_ERR(priv, "Unable to initialize RFKILL system. "
"Ignoring error: %d\n", err); "Ignoring error: %d\n", err);
iwl_power_initialize(priv); iwl_power_initialize(priv);
return 0; return 0;
......
drivers/net/wireless/iwlwifi/iwl-calib.c
View file @ 15b1687c
...@@ -102,7 +102,7 @@ int iwl_send_calib_results(struct iwl_priv *priv) ...@@ -102,7 +102,7 @@ int iwl_send_calib_results(struct iwl_priv *priv)
return 0; return 0;
err: err:
IWL_ERROR("Error %d iteration %d\n", ret, i); IWL_ERR(priv, "Error %d iteration %d\n", ret, i);
return ret; return ret;
} }
EXPORT_SYMBOL(iwl_send_calib_results); EXPORT_SYMBOL(iwl_send_calib_results);
...@@ -483,7 +483,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv) ...@@ -483,7 +483,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
ret = iwl_send_cmd(priv, &cmd_out); ret = iwl_send_cmd(priv, &cmd_out);
if (ret) if (ret)
IWL_ERROR("SENSITIVITY_CMD failed\n"); IWL_ERR(priv, "SENSITIVITY_CMD failed\n");
return ret; return ret;
} }
......
drivers/net/wireless/iwlwifi/iwl-core.c
View file @ 15b1687c
...@@ -211,7 +211,7 @@ int iwl_hw_nic_init(struct iwl_priv *priv) ...@@ -211,7 +211,7 @@ int iwl_hw_nic_init(struct iwl_priv *priv)
if (!rxq->bd) { if (!rxq->bd) {
ret = iwl_rx_queue_alloc(priv); ret = iwl_rx_queue_alloc(priv);
if (ret) { if (ret) {
IWL_ERROR("Unable to initialize Rx queue\n"); IWL_ERR(priv, "Unable to initialize Rx queue\n");
return -ENOMEM; return -ENOMEM;
} }
} else } else
...@@ -678,7 +678,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt) ...@@ -678,7 +678,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
break; break;
case WLAN_HT_CAP_SM_PS_INVALID: case WLAN_HT_CAP_SM_PS_INVALID:
default: default:
IWL_ERROR("invalid mimo ps mode %d\n", IWL_ERR(priv, "invalid mimo ps mode %d\n",
priv->current_ht_config.sm_ps); priv->current_ht_config.sm_ps);
WARN_ON(1); WARN_ON(1);
idle_cnt = -1; idle_cnt = -1;
...@@ -830,7 +830,7 @@ int iwl_setup_mac(struct iwl_priv *priv) ...@@ -830,7 +830,7 @@ int iwl_setup_mac(struct iwl_priv *priv)
ret = ieee80211_register_hw(priv->hw); ret = ieee80211_register_hw(priv->hw);
if (ret) { if (ret) {
IWL_ERROR("Failed to register hw (error %d)\n", ret); IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);
return ret; return ret;
} }
priv->mac80211_registered = 1; priv->mac80211_registered = 1;
...@@ -901,13 +901,13 @@ int iwl_init_drv(struct iwl_priv *priv) ...@@ -901,13 +901,13 @@ int iwl_init_drv(struct iwl_priv *priv)
ret = iwl_init_channel_map(priv); ret = iwl_init_channel_map(priv);
if (ret) { if (ret) {
IWL_ERROR("initializing regulatory failed: %d\n", ret); IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
goto err; goto err;
} }
ret = iwlcore_init_geos(priv); ret = iwlcore_init_geos(priv);
if (ret) { if (ret) {
IWL_ERROR("initializing geos failed: %d\n", ret); IWL_ERR(priv, "initializing geos failed: %d\n", ret);
goto err_free_channel_map; goto err_free_channel_map;
} }
...@@ -1059,7 +1059,7 @@ static int iwl_verify_inst_full(struct iwl_priv *priv, __le32 *image, ...@@ -1059,7 +1059,7 @@ static int iwl_verify_inst_full(struct iwl_priv *priv, __le32 *image,
* if IWL_DL_IO is set */ * if IWL_DL_IO is set */
val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image)) {
IWL_ERROR("uCode INST section is invalid at " IWL_ERR(priv, "uCode INST section is invalid at "
"offset 0x%x, is 0x%x, s/b 0x%x\n", "offset 0x%x, is 0x%x, s/b 0x%x\n",
save_len - len, val, le32_to_cpu(*image)); save_len - len, val, le32_to_cpu(*image));
ret = -EIO; ret = -EIO;
...@@ -1115,7 +1115,7 @@ int iwl_verify_ucode(struct iwl_priv *priv) ...@@ -1115,7 +1115,7 @@ int iwl_verify_ucode(struct iwl_priv *priv)
return 0; return 0;
} }
IWL_ERROR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n"); IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
/* Since nothing seems to match, show first several data entries in /* Since nothing seems to match, show first several data entries in
* instruction SRAM, so maybe visual inspection will give a clue. * instruction SRAM, so maybe visual inspection will give a clue.
...@@ -1187,7 +1187,7 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv) ...@@ -1187,7 +1187,7 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv)
base = le32_to_cpu(priv->card_alive.error_event_table_ptr); base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) { if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
IWL_ERROR("Not valid error log pointer 0x%08X\n", base); IWL_ERR(priv, "Not valid error log pointer 0x%08X\n", base);
return; return;
} }
...@@ -1200,8 +1200,9 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv) ...@@ -1200,8 +1200,9 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv)
count = iwl_read_targ_mem(priv, base); count = iwl_read_targ_mem(priv, base);
if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
IWL_ERROR("Start IWL Error Log Dump:\n"); IWL_ERR(priv, "Start IWL Error Log Dump:\n");
IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count); IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",
priv->status, count);
} }
desc = iwl_read_targ_mem(priv, base + 1 * sizeof(u32)); desc = iwl_read_targ_mem(priv, base + 1 * sizeof(u32));
...@@ -1214,12 +1215,12 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv) ...@@ -1214,12 +1215,12 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv)
line = iwl_read_targ_mem(priv, base + 9 * sizeof(u32)); line = iwl_read_targ_mem(priv, base + 9 * sizeof(u32));
time = iwl_read_targ_mem(priv, base + 11 * sizeof(u32)); time = iwl_read_targ_mem(priv, base + 11 * sizeof(u32));
IWL_ERROR("Desc Time " IWL_ERR(priv, "Desc Time "
"data1 data2 line\n"); "data1 data2 line\n");
IWL_ERROR("%-28s (#%02d) %010u 0x%08X 0x%08X %u\n", IWL_ERR(priv, "%-28s (#%02d) %010u 0x%08X 0x%08X %u\n",
desc_lookup(desc), desc, time, data1, data2, line); desc_lookup(desc), desc, time, data1, data2, line);
IWL_ERROR("blink1 blink2 ilink1 ilink2\n"); IWL_ERR(priv, "blink1 blink2 ilink1 ilink2\n");
IWL_ERROR("0x%05X 0x%05X 0x%05X 0x%05X\n", blink1, blink2, IWL_ERR(priv, "0x%05X 0x%05X 0x%05X 0x%05X\n", blink1, blink2,
ilink1, ilink2); ilink1, ilink2);
iwl_release_nic_access(priv); iwl_release_nic_access(priv);
...@@ -1265,11 +1266,11 @@ static void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, ...@@ -1265,11 +1266,11 @@ static void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
ptr += sizeof(u32); ptr += sizeof(u32);
if (mode == 0) { if (mode == 0) {
/* data, ev */ /* data, ev */
IWL_ERROR("EVT_LOG:0x%08x:%04u\n", time, ev); IWL_ERR(priv, "EVT_LOG:0x%08x:%04u\n", time, ev);
} else { } else {
data = iwl_read_targ_mem(priv, ptr); data = iwl_read_targ_mem(priv, ptr);
ptr += sizeof(u32); ptr += sizeof(u32);
IWL_ERROR("EVT_LOGT:%010u:0x%08x:%04u\n", IWL_ERR(priv, "EVT_LOGT:%010u:0x%08x:%04u\n",
time, data, ev); time, data, ev);
} }
} }
...@@ -1291,7 +1292,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv) ...@@ -1291,7 +1292,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv)
base = le32_to_cpu(priv->card_alive.log_event_table_ptr); base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) { if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
IWL_ERROR("Invalid event log pointer 0x%08X\n", base); IWL_ERR(priv, "Invalid event log pointer 0x%08X\n", base);
return; return;
} }
...@@ -1311,12 +1312,12 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv) ...@@ -1311,12 +1312,12 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv)
/* bail out if nothing in log */ /* bail out if nothing in log */
if (size == 0) { if (size == 0) {
IWL_ERROR("Start IWL Event Log Dump: nothing in log\n"); IWL_ERR(priv, "Start IWL Event Log Dump: nothing in log\n");
iwl_release_nic_access(priv); iwl_release_nic_access(priv);
return; return;
} }
IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n", IWL_ERR(priv, "Start IWL Event Log Dump: display count %d, wraps %d\n",
size, num_wraps); size, num_wraps);
/* if uCode has wrapped back to top of log, start at the oldest entry, /* if uCode has wrapped back to top of log, start at the oldest entry,
...@@ -1348,7 +1349,7 @@ void iwl_rf_kill_ct_config(struct iwl_priv *priv) ...@@ -1348,7 +1349,7 @@ void iwl_rf_kill_ct_config(struct iwl_priv *priv)
ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD, ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,
sizeof(cmd), &cmd); sizeof(cmd), &cmd);
if (ret) if (ret)
IWL_ERROR("REPLY_CT_KILL_CONFIG_CMD failed\n"); IWL_ERR(priv, "REPLY_CT_KILL_CONFIG_CMD failed\n");
else else
IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded, " IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded, "
"critical temperature is %d\n", "critical temperature is %d\n",
......
drivers/net/wireless/iwlwifi/iwl-debug.h
View file @ 15b1687c
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
struct iwl_priv; struct iwl_priv;
#define IWL_ERROR(f, a...) dev_err(&(priv->pci_dev->dev), f, ## a)
#define IWL_ERR(p, f, a...) dev_err(&((p)->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_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) #define IWL_INFO(p, f, a...) dev_info(&((p)->pci_dev->dev), f, ## a)
......
drivers/net/wireless/iwlwifi/iwl-debugfs.c
View file @ 15b1687c
...@@ -306,14 +306,14 @@ static ssize_t iwl_dbgfs_eeprom_read(struct file *file, ...@@ -306,14 +306,14 @@ static ssize_t iwl_dbgfs_eeprom_read(struct file *file,
buf_size = 4 * eeprom_len + 256; buf_size = 4 * eeprom_len + 256;
if (eeprom_len % 16) { if (eeprom_len % 16) {
IWL_ERROR("EEPROM size is not multiple of 16.\n"); IWL_ERR(priv, "EEPROM size is not multiple of 16.\n");
return -ENODATA; return -ENODATA;
} }
/* 4 characters for byte 0xYY */ /* 4 characters for byte 0xYY */
buf = kzalloc(buf_size, GFP_KERNEL); buf = kzalloc(buf_size, GFP_KERNEL);
if (!buf) { if (!buf) {
IWL_ERROR("Can not allocate Buffer\n"); IWL_ERR(priv, "Can not allocate Buffer\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -370,7 +370,7 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf, ...@@ -370,7 +370,7 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
buf = kzalloc(bufsz, GFP_KERNEL); buf = kzalloc(bufsz, GFP_KERNEL);
if (!buf) { if (!buf) {
IWL_ERROR("Can not allocate Buffer\n"); IWL_ERR(priv, "Can not allocate Buffer\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -474,7 +474,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) ...@@ -474,7 +474,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
return 0; return 0;
err: err:
IWL_ERROR("Can't open the debugfs directory\n"); IWL_ERR(priv, "Can't open the debugfs directory\n");
iwl_dbgfs_unregister(priv); iwl_dbgfs_unregister(priv);
return ret; return ret;
} }
......
drivers/net/wireless/iwlwifi/iwl-eeprom.c
View file @ 15b1687c
...@@ -145,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv) ...@@ -145,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv)
{ {
u32 gp = iwl_read32(priv, CSR_EEPROM_GP); u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
return -ENOENT; return -ENOENT;
} }
return 0; return 0;
...@@ -223,7 +223,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) ...@@ -223,7 +223,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv); ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
ret = -ENOENT; ret = -ENOENT;
goto err; goto err;
} }
...@@ -231,7 +231,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) ...@@ -231,7 +231,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
/* Make sure driver (instead of uCode) is allowed to read EEPROM */ /* Make sure driver (instead of uCode) is allowed to read EEPROM */
ret = priv->cfg->ops->lib->eeprom_ops.acquire_semaphore(priv); ret = priv->cfg->ops->lib->eeprom_ops.acquire_semaphore(priv);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("Failed to acquire EEPROM semaphore.\n"); IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");
ret = -ENOENT; ret = -ENOENT;
goto err; goto err;
} }
...@@ -247,7 +247,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) ...@@ -247,7 +247,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
CSR_EEPROM_REG_READ_VALID_MSK, CSR_EEPROM_REG_READ_VALID_MSK,
IWL_EEPROM_ACCESS_TIMEOUT); IWL_EEPROM_ACCESS_TIMEOUT);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("Time out reading EEPROM[%d]\n", addr); IWL_ERR(priv, "Time out reading EEPROM[%d]\n", addr);
goto done; goto done;
} }
r = _iwl_read_direct32(priv, CSR_EEPROM_REG); r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
...@@ -285,7 +285,7 @@ int iwl_eeprom_check_version(struct iwl_priv *priv) ...@@ -285,7 +285,7 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)
return 0; return 0;
err: err:
IWL_ERROR("Unsupported EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n", IWL_ERR(priv, "Unsupported EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n",
eeprom_ver, priv->cfg->eeprom_ver, eeprom_ver, priv->cfg->eeprom_ver,
calib_ver, priv->cfg->eeprom_calib_ver); calib_ver, priv->cfg->eeprom_calib_ver);
return -EINVAL; return -EINVAL;
...@@ -450,7 +450,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) ...@@ -450,7 +450,7 @@ int iwl_init_channel_map(struct iwl_priv *priv)
priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) * priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) *
priv->channel_count, GFP_KERNEL); priv->channel_count, GFP_KERNEL);
if (!priv->channel_info) { if (!priv->channel_info) {
IWL_ERROR("Could not allocate channel_info\n"); IWL_ERR(priv, "Could not allocate channel_info\n");
priv->channel_count = 0; priv->channel_count = 0;
return -ENOMEM; return -ENOMEM;
} }
......
drivers/net/wireless/iwlwifi/iwl-hcmd.c
View file @ 15b1687c
...@@ -109,14 +109,14 @@ static int iwl_generic_cmd_callback(struct iwl_priv *priv, ...@@ -109,14 +109,14 @@ static int iwl_generic_cmd_callback(struct iwl_priv *priv,
struct iwl_rx_packet *pkt = NULL; struct iwl_rx_packet *pkt = NULL;
if (!skb) { 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)); get_cmd_string(cmd->hdr.cmd));
return 1; return 1;
} }
pkt = (struct iwl_rx_packet *)skb->data; pkt = (struct iwl_rx_packet *)skb->data;
if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { 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); get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
return 1; return 1;
} }
...@@ -156,7 +156,7 @@ static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd) ...@@ -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); ret = iwl_enqueue_hcmd(priv, cmd);
if (ret < 0) { 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); get_cmd_string(cmd->id), ret);
return ret; return ret;
} }
...@@ -174,8 +174,9 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) ...@@ -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); BUG_ON(cmd->meta.u.callback != NULL);
if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) { if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) {
IWL_ERROR("Error sending %s: Already sending a host command\n", IWL_ERR(priv,
get_cmd_string(cmd->id)); "Error sending %s: Already sending a host command\n",
get_cmd_string(cmd->id));
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -188,7 +189,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) ...@@ -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); cmd_idx = iwl_enqueue_hcmd(priv, cmd);
if (cmd_idx < 0) { if (cmd_idx < 0) {
ret = cmd_idx; 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); get_cmd_string(cmd->id), ret);
goto out; goto out;
} }
...@@ -198,9 +199,10 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) ...@@ -198,9 +199,10 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
HOST_COMPLETE_TIMEOUT); HOST_COMPLETE_TIMEOUT);
if (!ret) { if (!ret) {
if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) { if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
IWL_ERROR("Error sending %s: time out after %dms.\n", IWL_ERR(priv,
get_cmd_string(cmd->id), "Error sending %s: time out after %dms.\n",
jiffies_to_msecs(HOST_COMPLETE_TIMEOUT)); get_cmd_string(cmd->id),
jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
clear_bit(STATUS_HCMD_ACTIVE, &priv->status); clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
...@@ -221,7 +223,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) ...@@ -221,7 +223,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
goto fail; goto fail;
} }
if ((cmd->meta.flags & CMD_WANT_SKB) && !cmd->meta.u.skb) { 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)); get_cmd_string(cmd->id));
ret = -EIO; ret = -EIO;
goto cancel; goto cancel;
......
drivers/net/wireless/iwlwifi/iwl-io.h
View file @ 15b1687c
...@@ -167,7 +167,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv) ...@@ -167,7 +167,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
(CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY | (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |
CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 50); CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 50);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("MAC is in deep sleep!\n"); IWL_ERR(priv, "MAC is in deep sleep!\n");
return -EIO; return -EIO;
} }
...@@ -182,7 +182,7 @@ static inline int __iwl_grab_nic_access(const char *f, u32 l, ...@@ -182,7 +182,7 @@ static inline int __iwl_grab_nic_access(const char *f, u32 l,
struct iwl_priv *priv) struct iwl_priv *priv)
{ {
if (atomic_read(&priv->restrict_refcnt)) if (atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Grabbing access while already held %s %d.\n", f, l); IWL_ERR(priv, "Grabbing access while already held %s %d.\n", f, l);
IWL_DEBUG_IO("grabbing nic access - %s %d\n", f, l); IWL_DEBUG_IO("grabbing nic access - %s %d\n", f, l);
return _iwl_grab_nic_access(priv); return _iwl_grab_nic_access(priv);
...@@ -207,7 +207,7 @@ static inline void __iwl_release_nic_access(const char *f, u32 l, ...@@ -207,7 +207,7 @@ static inline void __iwl_release_nic_access(const char *f, u32 l,
struct iwl_priv *priv) struct iwl_priv *priv)
{ {
if (atomic_read(&priv->restrict_refcnt) <= 0) if (atomic_read(&priv->restrict_refcnt) <= 0)
IWL_ERROR("Release unheld nic access at line %s %d.\n", f, l); IWL_ERR(priv, "Release unheld nic access at line %s %d.\n", f, l);
IWL_DEBUG_IO("releasing nic access - %s %d\n", f, l); IWL_DEBUG_IO("releasing nic access - %s %d\n", f, l);
_iwl_release_nic_access(priv); _iwl_release_nic_access(priv);
...@@ -229,7 +229,7 @@ static inline u32 __iwl_read_direct32(const char *f, u32 l, ...@@ -229,7 +229,7 @@ static inline u32 __iwl_read_direct32(const char *f, u32 l,
{ {
u32 value = _iwl_read_direct32(priv, reg); u32 value = _iwl_read_direct32(priv, reg);
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from %s %d\n", f, l); IWL_ERR(priv, "Nic access not held from %s %d\n", f, l);
IWL_DEBUG_IO("read_direct32(0x%4X) = 0x%08x - %s %d \n", reg, value, IWL_DEBUG_IO("read_direct32(0x%4X) = 0x%08x - %s %d \n", reg, value,
f, l); f, l);
return value; return value;
...@@ -250,7 +250,7 @@ static void __iwl_write_direct32(const char *f , u32 line, ...@@ -250,7 +250,7 @@ static void __iwl_write_direct32(const char *f , u32 line,
struct iwl_priv *priv, u32 reg, u32 value) struct iwl_priv *priv, u32 reg, u32 value)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from %s line %d\n", f, line); IWL_ERR(priv, "Nic access not held from %s line %d\n", f, line);
_iwl_write_direct32(priv, reg, value); _iwl_write_direct32(priv, reg, value);
} }
#define iwl_write_direct32(priv, reg, value) \ #define iwl_write_direct32(priv, reg, value) \
...@@ -308,7 +308,7 @@ static inline u32 __iwl_read_prph(const char *f, u32 line, ...@@ -308,7 +308,7 @@ static inline u32 __iwl_read_prph(const char *f, u32 line,
struct iwl_priv *priv, u32 reg) struct iwl_priv *priv, u32 reg)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from %s line %d\n", f, line); IWL_ERR(priv, "Nic access not held from %s line %d\n", f, line);
return _iwl_read_prph(priv, reg); return _iwl_read_prph(priv, reg);
} }
...@@ -331,7 +331,7 @@ static inline void __iwl_write_prph(const char *f, u32 line, ...@@ -331,7 +331,7 @@ static inline void __iwl_write_prph(const char *f, u32 line,
struct iwl_priv *priv, u32 addr, u32 val) struct iwl_priv *priv, u32 addr, u32 val)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from %s line %d\n", f, line); IWL_ERR(priv, "Nic access not held from %s line %d\n", f, line);
_iwl_write_prph(priv, addr, val); _iwl_write_prph(priv, addr, val);
} }
...@@ -349,7 +349,7 @@ static inline void __iwl_set_bits_prph(const char *f, u32 line, ...@@ -349,7 +349,7 @@ static inline void __iwl_set_bits_prph(const char *f, u32 line,
u32 reg, u32 mask) u32 reg, u32 mask)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from %s line %d\n", f, line); IWL_ERR(priv, "Nic access not held from %s line %d\n", f, line);
_iwl_set_bits_prph(priv, reg, mask); _iwl_set_bits_prph(priv, reg, mask);
} }
...@@ -367,7 +367,7 @@ static inline void __iwl_set_bits_mask_prph(const char *f, u32 line, ...@@ -367,7 +367,7 @@ static inline void __iwl_set_bits_mask_prph(const char *f, u32 line,
struct iwl_priv *priv, u32 reg, u32 bits, u32 mask) struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from %s line %d\n", f, line); IWL_ERR(priv, "Nic access not held from %s line %d\n", f, line);
_iwl_set_bits_mask_prph(priv, reg, bits, mask); _iwl_set_bits_mask_prph(priv, reg, bits, mask);
} }
#define iwl_set_bits_mask_prph(priv, reg, bits, mask) \ #define iwl_set_bits_mask_prph(priv, reg, bits, mask) \
......
drivers/net/wireless/iwlwifi/iwl-led.c
View file @ 15b1687c
...@@ -254,7 +254,7 @@ static int iwl_leds_register_led(struct iwl_priv *priv, struct iwl_led *led, ...@@ -254,7 +254,7 @@ static int iwl_leds_register_led(struct iwl_priv *priv, struct iwl_led *led,
ret = led_classdev_register(device, &led->led_dev); ret = led_classdev_register(device, &led->led_dev);
if (ret) { if (ret) {
IWL_ERROR("Error: failed to register led handler.\n"); IWL_ERR(priv, "Error: failed to register led handler.\n");
return ret; return ret;
} }
......
drivers/net/wireless/iwlwifi/iwl-rfkill.c
View file @ 15b1687c
...@@ -82,7 +82,7 @@ int iwl_rfkill_init(struct iwl_priv *priv) ...@@ -82,7 +82,7 @@ int iwl_rfkill_init(struct iwl_priv *priv)
IWL_DEBUG_RF_KILL("Initializing RFKILL.\n"); IWL_DEBUG_RF_KILL("Initializing RFKILL.\n");
priv->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN); priv->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
if (!priv->rfkill) { if (!priv->rfkill) {
IWL_ERROR("Unable to allocate RFKILL device.\n"); IWL_ERR(priv, "Unable to allocate RFKILL device.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
} }
...@@ -98,7 +98,7 @@ int iwl_rfkill_init(struct iwl_priv *priv) ...@@ -98,7 +98,7 @@ int iwl_rfkill_init(struct iwl_priv *priv)
ret = rfkill_register(priv->rfkill); ret = rfkill_register(priv->rfkill);
if (ret) { if (ret) {
IWL_ERROR("Unable to register RFKILL: %d\n", ret); IWL_ERR(priv, "Unable to register RFKILL: %d\n", ret);
goto free_rfkill; goto free_rfkill;
} }
......
drivers/net/wireless/iwlwifi/iwl-rx.c
View file @ 15b1687c
...@@ -894,7 +894,7 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv, ...@@ -894,7 +894,7 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv,
rx_start = (struct iwl_rx_phy_res *)&priv->last_phy_res[1]; rx_start = (struct iwl_rx_phy_res *)&priv->last_phy_res[1];
if (!rx_start) { if (!rx_start) {
IWL_ERROR("MPDU frame without a PHY data\n"); IWL_ERR(priv, "MPDU frame without a PHY data\n");
return; return;
} }
if (include_phy) { if (include_phy) {
...@@ -1020,7 +1020,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, ...@@ -1020,7 +1020,7 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
} }
if (!rx_start) { if (!rx_start) {
IWL_ERROR("MPDU frame without a PHY data\n"); IWL_ERR(priv, "MPDU frame without a PHY data\n");
return; return;
} }
......
drivers/net/wireless/iwlwifi/iwl-spectrum.c
View file @ 15b1687c
...@@ -146,7 +146,7 @@ static int iwl_get_measurement(struct iwl_priv *priv, ...@@ -146,7 +146,7 @@ static int iwl_get_measurement(struct iwl_priv *priv,
res = (struct iwl_rx_packet *)cmd.meta.u.skb->data; res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
IWL_ERROR("Bad return from REPLY_RX_ON_ASSOC command\n"); IWL_ERR(priv, "Bad return from REPLY_RX_ON_ASSOC command\n");
rc = -EIO; rc = -EIO;
} }
......
drivers/net/wireless/iwlwifi/iwl-sta.c
View file @ 15b1687c
...@@ -87,7 +87,8 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id) ...@@ -87,7 +87,8 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
spin_lock_irqsave(&priv->sta_lock, flags); spin_lock_irqsave(&priv->sta_lock, flags);
if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) 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; priv->stations[sta_id].used |= IWL_STA_UCODE_ACTIVE;
IWL_DEBUG_ASSOC("Added STA to Ucode: %pM\n", IWL_DEBUG_ASSOC("Added STA to Ucode: %pM\n",
...@@ -105,13 +106,13 @@ static int iwl_add_sta_callback(struct iwl_priv *priv, ...@@ -105,13 +106,13 @@ static int iwl_add_sta_callback(struct iwl_priv *priv,
u8 sta_id = addsta->sta.sta_id; u8 sta_id = addsta->sta.sta_id;
if (!skb) { 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; return 1;
} }
res = (struct iwl_rx_packet *)skb->data; res = (struct iwl_rx_packet *)skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 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); res->hdr.flags);
return 1; return 1;
} }
...@@ -155,7 +156,7 @@ static int iwl_send_add_sta(struct iwl_priv *priv, ...@@ -155,7 +156,7 @@ static int iwl_send_add_sta(struct iwl_priv *priv,
res = (struct iwl_rx_packet *)cmd.meta.u.skb->data; res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 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); res->hdr.flags);
ret = -EIO; ret = -EIO;
} }
...@@ -307,7 +308,7 @@ static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr) ...@@ -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 */ /* Ucode must be active and driver must be non active */
if (priv->stations[sta_id].used != IWL_STA_UCODE_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; priv->stations[sta_id].used &= ~IWL_STA_UCODE_ACTIVE;
...@@ -324,13 +325,13 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv, ...@@ -324,13 +325,13 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv,
const char *addr = rm_sta->addr; const char *addr = rm_sta->addr;
if (!skb) { 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; return 1;
} }
res = (struct iwl_rx_packet *)skb->data; res = (struct iwl_rx_packet *)skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 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); res->hdr.flags);
return 1; return 1;
} }
...@@ -340,7 +341,7 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv, ...@@ -340,7 +341,7 @@ static int iwl_remove_sta_callback(struct iwl_priv *priv,
iwl_sta_ucode_deactivate(priv, addr); iwl_sta_ucode_deactivate(priv, addr);
break; break;
default: default:
IWL_ERROR("REPLY_REMOVE_STA failed\n"); IWL_ERR(priv, "REPLY_REMOVE_STA failed\n");
break; break;
} }
...@@ -378,7 +379,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, const u8 *addr, ...@@ -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; res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 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); res->hdr.flags);
ret = -EIO; ret = -EIO;
} }
...@@ -391,7 +392,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, const u8 *addr, ...@@ -391,7 +392,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, const u8 *addr,
break; break;
default: default:
ret = -EIO; ret = -EIO;
IWL_ERROR("REPLY_REMOVE_STA failed\n"); IWL_ERR(priv, "REPLY_REMOVE_STA failed\n");
break; break;
} }
} }
...@@ -433,13 +434,13 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap) ...@@ -433,13 +434,13 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
sta_id, addr); sta_id, addr);
if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) { 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); addr);
goto out; goto out;
} }
if (!(priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE)) { 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); addr);
goto out; goto out;
} }
...@@ -475,7 +476,7 @@ void iwl_clear_stations_table(struct iwl_priv *priv) ...@@ -475,7 +476,7 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
if (iwl_is_alive(priv) && if (iwl_is_alive(priv) &&
!test_bit(STATUS_EXIT_PENDING, &priv->status) && !test_bit(STATUS_EXIT_PENDING, &priv->status) &&
iwl_send_cmd_pdu_async(priv, REPLY_REMOVE_ALL_STA, 0, NULL, NULL)) 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; priv->num_stations = 0;
memset(priv->stations, 0, sizeof(priv->stations)); memset(priv->stations, 0, sizeof(priv->stations));
...@@ -548,7 +549,7 @@ int iwl_remove_default_wep_key(struct iwl_priv *priv, ...@@ -548,7 +549,7 @@ int iwl_remove_default_wep_key(struct iwl_priv *priv,
spin_lock_irqsave(&priv->sta_lock, flags); spin_lock_irqsave(&priv->sta_lock, flags);
if (!test_and_clear_bit(keyconf->keyidx, &priv->ucode_key_table)) 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); keyconf->keyidx);
priv->default_wep_key--; priv->default_wep_key--;
...@@ -582,7 +583,7 @@ int iwl_set_default_wep_key(struct iwl_priv *priv, ...@@ -582,7 +583,7 @@ int iwl_set_default_wep_key(struct iwl_priv *priv,
priv->default_wep_key++; priv->default_wep_key++;
if (test_and_set_bit(keyconf->keyidx, &priv->ucode_key_table)) 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); keyconf->keyidx);
priv->wep_keys[keyconf->keyidx].key_size = keyconf->keylen; priv->wep_keys[keyconf->keyidx].key_size = keyconf->keylen;
...@@ -820,7 +821,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, ...@@ -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, if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset,
&priv->ucode_key_table)) &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); priv->stations[sta_id].sta.key.key_offset);
memset(&priv->stations[sta_id].keyinfo, 0, memset(&priv->stations[sta_id].keyinfo, 0,
sizeof(struct iwl_hw_key)); sizeof(struct iwl_hw_key));
...@@ -857,7 +858,8 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, ...@@ -857,7 +858,8 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,
ret = iwl_set_wep_dynamic_key_info(priv, keyconf, sta_id); ret = iwl_set_wep_dynamic_key_info(priv, keyconf, sta_id);
break; break;
default: 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; ret = -EINVAL;
} }
......
drivers/net/wireless/iwlwifi/iwl-tx.c
View file @ 15b1687c
...@@ -138,7 +138,7 @@ static void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) ...@@ -138,7 +138,7 @@ static void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
num_tbs = iwl_tfd_get_num_tbs(tfd); num_tbs = iwl_tfd_get_num_tbs(tfd);
if (num_tbs >= IWL_NUM_OF_TBS) { if (num_tbs >= IWL_NUM_OF_TBS) {
IWL_ERROR("Too many chunks: %i\n", num_tbs); IWL_ERR(priv, "Too many chunks: %i\n", num_tbs);
/* @todo issue fatal error, it is quite serious situation */ /* @todo issue fatal error, it is quite serious situation */
return; return;
} }
...@@ -171,14 +171,14 @@ static int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, ...@@ -171,14 +171,14 @@ static int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
/* Each TFD can point to a maximum 20 Tx buffers */ /* Each TFD can point to a maximum 20 Tx buffers */
if (num_tbs >= IWL_NUM_OF_TBS) { if (num_tbs >= IWL_NUM_OF_TBS) {
IWL_ERROR("Error can not send more than %d chunks\n", IWL_ERR(priv, "Error can not send more than %d chunks\n",
IWL_NUM_OF_TBS); IWL_NUM_OF_TBS);
return -EINVAL; return -EINVAL;
} }
BUG_ON(addr & ~DMA_BIT_MASK(36)); BUG_ON(addr & ~DMA_BIT_MASK(36));
if (unlikely(addr & ~IWL_TX_DMA_MASK)) if (unlikely(addr & ~IWL_TX_DMA_MASK))
IWL_ERROR("Unaligned address = %llx\n", IWL_ERR(priv, "Unaligned address = %llx\n",
(unsigned long long)addr); (unsigned long long)addr);
iwl_tfd_set_tb(tfd, num_tbs, addr, len); iwl_tfd_set_tb(tfd, num_tbs, addr, len);
...@@ -395,7 +395,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv, ...@@ -395,7 +395,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
txq->txb = kmalloc(sizeof(txq->txb[0]) * txq->txb = kmalloc(sizeof(txq->txb[0]) *
TFD_QUEUE_SIZE_MAX, GFP_KERNEL); TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
if (!txq->txb) { if (!txq->txb) {
IWL_ERROR("kmalloc for auxiliary BD " IWL_ERR(priv, "kmalloc for auxiliary BD "
"structures failed\n"); "structures failed\n");
goto error; goto error;
} }
...@@ -409,7 +409,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv, ...@@ -409,7 +409,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
&txq->q.dma_addr); &txq->q.dma_addr);
if (!txq->tfds) { if (!txq->tfds) {
IWL_ERROR("pci_alloc_consistent(%zd) failed\n", IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n",
sizeof(txq->tfds[0]) * TFD_QUEUE_SIZE_MAX); sizeof(txq->tfds[0]) * TFD_QUEUE_SIZE_MAX);
goto error; goto error;
} }
...@@ -557,13 +557,13 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) ...@@ -557,13 +557,13 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)
ret = iwl_alloc_dma_ptr(priv, &priv->scd_bc_tbls, ret = iwl_alloc_dma_ptr(priv, &priv->scd_bc_tbls,
priv->hw_params.scd_bc_tbls_size); priv->hw_params.scd_bc_tbls_size);
if (ret) { if (ret) {
IWL_ERROR("Scheduler BC Table allocation failed\n"); IWL_ERR(priv, "Scheduler BC Table allocation failed\n");
goto error_bc_tbls; goto error_bc_tbls;
} }
/* Alloc keep-warm buffer */ /* Alloc keep-warm buffer */
ret = iwl_alloc_dma_ptr(priv, &priv->kw, IWL_KW_SIZE); ret = iwl_alloc_dma_ptr(priv, &priv->kw, IWL_KW_SIZE);
if (ret) { if (ret) {
IWL_ERROR("Keep Warm allocation failed\n"); IWL_ERR(priv, "Keep Warm allocation failed\n");
goto error_kw; goto error_kw;
} }
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
...@@ -589,7 +589,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) ...@@ -589,7 +589,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)
ret = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num, ret = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num,
txq_id); txq_id);
if (ret) { if (ret) {
IWL_ERROR("Tx %d queue init failed\n", txq_id); IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);
goto error; goto error;
} }
} }
...@@ -850,7 +850,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) ...@@ -850,7 +850,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) == if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) ==
IWL_INVALID_RATE) { IWL_INVALID_RATE) {
IWL_ERROR("ERROR: No TX rate available.\n"); IWL_ERR(priv, "ERROR: No TX rate available.\n");
goto drop_unlock; goto drop_unlock;
} }
...@@ -1086,7 +1086,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) ...@@ -1086,7 +1086,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
} }
if (iwl_queue_space(q) < ((cmd->meta.flags & CMD_ASYNC) ? 2 : 1)) { if (iwl_queue_space(q) < ((cmd->meta.flags & CMD_ASYNC) ? 2 : 1)) {
IWL_ERROR("No space for Tx\n"); IWL_ERR(priv, "No space for Tx\n");
return -ENOSPC; return -ENOSPC;
} }
...@@ -1163,7 +1163,7 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) ...@@ -1163,7 +1163,7 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
int nfreed = 0; int nfreed = 0;
if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) { if ((index >= q->n_bd) || (iwl_queue_used(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, "is out of range [0-%d] %d %d.\n", txq_id,
index, q->n_bd, q->write_ptr, q->read_ptr); index, q->n_bd, q->write_ptr, q->read_ptr);
return 0; return 0;
...@@ -1203,7 +1203,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, ...@@ -1203,7 +1203,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id,
int nfreed = 0; int nfreed = 0;
if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) { if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 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, "is out of range [0-%d] %d %d.\n", txq_id,
idx, q->n_bd, q->write_ptr, q->read_ptr); idx, q->n_bd, q->write_ptr, q->read_ptr);
return; return;
...@@ -1218,7 +1218,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, ...@@ -1218,7 +1218,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id,
q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) { q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
if (nfreed++ > 0) { if (nfreed++ > 0) {
IWL_ERROR("HCMD skipped: index (%d) %d %d\n", idx, IWL_ERR(priv, "HCMD skipped: index (%d) %d %d\n", idx,
q->write_ptr, q->read_ptr); q->write_ptr, q->read_ptr);
queue_work(priv->workqueue, &priv->restart); queue_work(priv->workqueue, &priv->restart);
} }
...@@ -1314,7 +1314,7 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn) ...@@ -1314,7 +1314,7 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
return -ENXIO; return -ENXIO;
if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) { if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) {
IWL_ERROR("Start AGG when state is not IWL_AGG_OFF !\n"); IWL_ERR(priv, "Start AGG when state is not IWL_AGG_OFF !\n");
return -ENXIO; return -ENXIO;
} }
...@@ -1354,7 +1354,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) ...@@ -1354,7 +1354,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
unsigned long flags; unsigned long flags;
if (!ra) { if (!ra) {
IWL_ERROR("ra = NULL\n"); IWL_ERR(priv, "ra = NULL\n");
return -EINVAL; return -EINVAL;
} }
...@@ -1455,7 +1455,7 @@ static int iwl_tx_status_reply_compressed_ba(struct iwl_priv *priv, ...@@ -1455,7 +1455,7 @@ static int iwl_tx_status_reply_compressed_ba(struct iwl_priv *priv,
struct ieee80211_tx_info *info; struct ieee80211_tx_info *info;
if (unlikely(!agg->wait_for_ba)) { if (unlikely(!agg->wait_for_ba)) {
IWL_ERROR("Received BA when not expected\n"); IWL_ERR(priv, "Received BA when not expected\n");
return -EINVAL; return -EINVAL;
} }
...@@ -1528,7 +1528,8 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv, ...@@ -1528,7 +1528,8 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
if (scd_flow >= priv->hw_params.max_txq_num) { if (scd_flow >= priv->hw_params.max_txq_num) {
IWL_ERROR("BUG_ON scd_flow is bigger than number of queues\n"); IWL_ERR(priv,
"BUG_ON scd_flow is bigger than number of queues\n");
return; return;
} }
......
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @ 15b1687c
...@@ -185,7 +185,7 @@ static int iwl3945_tx_queue_alloc(struct iwl_priv *priv, ...@@ -185,7 +185,7 @@ static int iwl3945_tx_queue_alloc(struct iwl_priv *priv,
txq->txb = kmalloc(sizeof(txq->txb[0]) * txq->txb = kmalloc(sizeof(txq->txb[0]) *
TFD_QUEUE_SIZE_MAX, GFP_KERNEL); TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
if (!txq->txb) { if (!txq->txb) {
IWL_ERROR("kmalloc for auxiliary BD " IWL_ERR(priv, "kmalloc for auxiliary BD "
"structures failed\n"); "structures failed\n");
goto error; goto error;
} }
...@@ -199,7 +199,7 @@ static int iwl3945_tx_queue_alloc(struct iwl_priv *priv, ...@@ -199,7 +199,7 @@ static int iwl3945_tx_queue_alloc(struct iwl_priv *priv,
&txq->q.dma_addr); &txq->q.dma_addr);
if (!txq->bd) { if (!txq->bd) {
IWL_ERROR("pci_alloc_consistent(%zd) failed\n", IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n",
sizeof(txq->bd[0]) * TFD_QUEUE_SIZE_MAX); sizeof(txq->bd[0]) * TFD_QUEUE_SIZE_MAX);
goto error; goto error;
} }
...@@ -528,7 +528,7 @@ static int iwl3945_enqueue_hcmd(struct iwl_priv *priv, struct iwl3945_host_cmd * ...@@ -528,7 +528,7 @@ static int iwl3945_enqueue_hcmd(struct iwl_priv *priv, struct iwl3945_host_cmd *
} }
if (iwl_queue_space(q) < ((cmd->meta.flags & CMD_ASYNC) ? 2 : 1)) { if (iwl_queue_space(q) < ((cmd->meta.flags & CMD_ASYNC) ? 2 : 1)) {
IWL_ERROR("No space for Tx\n"); IWL_ERR(priv, "No space for Tx\n");
return -ENOSPC; return -ENOSPC;
} }
...@@ -596,8 +596,9 @@ static int iwl3945_send_cmd_async(struct iwl_priv *priv, struct iwl3945_host_cmd ...@@ -596,8 +596,9 @@ static int iwl3945_send_cmd_async(struct iwl_priv *priv, struct iwl3945_host_cmd
ret = iwl3945_enqueue_hcmd(priv, cmd); ret = iwl3945_enqueue_hcmd(priv, cmd);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("Error sending %s: iwl3945_enqueue_hcmd failed: %d\n", IWL_ERR(priv,
get_cmd_string(cmd->id), ret); "Error sending %s: iwl3945_enqueue_hcmd failed: %d\n",
get_cmd_string(cmd->id), ret);
return ret; return ret;
} }
return 0; return 0;
...@@ -614,8 +615,9 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd ...@@ -614,8 +615,9 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd
BUG_ON(cmd->meta.u.callback != NULL); BUG_ON(cmd->meta.u.callback != NULL);
if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) { if (test_and_set_bit(STATUS_HCMD_SYNC_ACTIVE, &priv->status)) {
IWL_ERROR("Error sending %s: Already sending a host command\n", IWL_ERR(priv,
get_cmd_string(cmd->id)); "Error sending %s: Already sending a host command\n",
get_cmd_string(cmd->id));
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -628,8 +630,9 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd ...@@ -628,8 +630,9 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd
cmd_idx = iwl3945_enqueue_hcmd(priv, cmd); cmd_idx = iwl3945_enqueue_hcmd(priv, cmd);
if (cmd_idx < 0) { if (cmd_idx < 0) {
ret = cmd_idx; ret = cmd_idx;
IWL_ERROR("Error sending %s: iwl3945_enqueue_hcmd failed: %d\n", IWL_ERR(priv,
get_cmd_string(cmd->id), ret); "Error sending %s: iwl3945_enqueue_hcmd failed: %d\n",
get_cmd_string(cmd->id), ret);
goto out; goto out;
} }
...@@ -638,7 +641,7 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd ...@@ -638,7 +641,7 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd
HOST_COMPLETE_TIMEOUT); HOST_COMPLETE_TIMEOUT);
if (!ret) { if (!ret) {
if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) { if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
IWL_ERROR("Error sending %s: time out after %dms.\n", IWL_ERR(priv, "Error sending %s: time out after %dms\n",
get_cmd_string(cmd->id), get_cmd_string(cmd->id),
jiffies_to_msecs(HOST_COMPLETE_TIMEOUT)); jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
...@@ -661,7 +664,7 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd ...@@ -661,7 +664,7 @@ static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd
goto fail; goto fail;
} }
if ((cmd->meta.flags & CMD_WANT_SKB) && !cmd->meta.u.skb) { 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)); get_cmd_string(cmd->id));
ret = -EIO; ret = -EIO;
goto cancel; goto cancel;
...@@ -837,7 +840,7 @@ static int iwl3945_check_rxon_cmd(struct iwl_priv *priv) ...@@ -837,7 +840,7 @@ static int iwl3945_check_rxon_cmd(struct iwl_priv *priv)
le16_to_cpu(rxon->channel)); le16_to_cpu(rxon->channel));
if (error) { if (error) {
IWL_ERROR("Not a valid iwl3945_rxon_assoc_cmd field values\n"); IWL_ERR(priv, "Not a valid rxon_assoc_cmd field values\n");
return -1; return -1;
} }
return 0; return 0;
...@@ -920,7 +923,7 @@ static int iwl3945_send_rxon_assoc(struct iwl_priv *priv) ...@@ -920,7 +923,7 @@ static int iwl3945_send_rxon_assoc(struct iwl_priv *priv)
res = (struct iwl_rx_packet *)cmd.meta.u.skb->data; res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
IWL_ERROR("Bad return from REPLY_RXON_ASSOC command\n"); IWL_ERR(priv, "Bad return from REPLY_RXON_ASSOC command\n");
rc = -EIO; rc = -EIO;
} }
...@@ -957,7 +960,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -957,7 +960,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
rc = iwl3945_check_rxon_cmd(priv); rc = iwl3945_check_rxon_cmd(priv);
if (rc) { if (rc) {
IWL_ERROR("Invalid RXON configuration. Not committing.\n"); IWL_ERR(priv, "Invalid RXON configuration. Not committing.\n");
return -EINVAL; return -EINVAL;
} }
...@@ -967,7 +970,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -967,7 +970,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
if (!iwl3945_full_rxon_required(priv)) { if (!iwl3945_full_rxon_required(priv)) {
rc = iwl3945_send_rxon_assoc(priv); rc = iwl3945_send_rxon_assoc(priv);
if (rc) { if (rc) {
IWL_ERROR("Error setting RXON_ASSOC " IWL_ERR(priv, "Error setting RXON_ASSOC "
"configuration (%d).\n", rc); "configuration (%d).\n", rc);
return rc; return rc;
} }
...@@ -994,7 +997,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -994,7 +997,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
* active_rxon back to what it was previously */ * active_rxon back to what it was previously */
if (rc) { if (rc) {
active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK; active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
IWL_ERROR("Error clearing ASSOC_MSK on current " IWL_ERR(priv, "Error clearing ASSOC_MSK on current "
"configuration (%d).\n", rc); "configuration (%d).\n", rc);
return rc; return rc;
} }
...@@ -1013,7 +1016,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -1013,7 +1016,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON, rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON,
sizeof(struct iwl3945_rxon_cmd), &priv->staging39_rxon); sizeof(struct iwl3945_rxon_cmd), &priv->staging39_rxon);
if (rc) { if (rc) {
IWL_ERROR("Error setting new configuration (%d).\n", rc); IWL_ERR(priv, "Error setting new configuration (%d).\n", rc);
return rc; return rc;
} }
...@@ -1025,14 +1028,14 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -1025,14 +1028,14 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
* send a new TXPOWER command or we won't be able to Tx any frames */ * send a new TXPOWER command or we won't be able to Tx any frames */
rc = iwl3945_hw_reg_send_txpower(priv); rc = iwl3945_hw_reg_send_txpower(priv);
if (rc) { if (rc) {
IWL_ERROR("Error setting Tx power (%d).\n", rc); IWL_ERR(priv, "Error setting Tx power (%d).\n", rc);
return rc; return rc;
} }
/* Add the broadcast address so we can send broadcast frames */ /* Add the broadcast address so we can send broadcast frames */
if (iwl3945_add_station(priv, iwl_bcast_addr, 0, 0) == if (iwl3945_add_station(priv, iwl_bcast_addr, 0, 0) ==
IWL_INVALID_STATION) { IWL_INVALID_STATION) {
IWL_ERROR("Error adding BROADCAST address for transmit.\n"); IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n");
return -EIO; return -EIO;
} }
...@@ -1042,14 +1045,14 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -1042,14 +1045,14 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
(priv->iw_mode == NL80211_IFTYPE_STATION)) (priv->iw_mode == NL80211_IFTYPE_STATION))
if (iwl3945_add_station(priv, priv->active39_rxon.bssid_addr, 1, 0) if (iwl3945_add_station(priv, priv->active39_rxon.bssid_addr, 1, 0)
== IWL_INVALID_STATION) { == IWL_INVALID_STATION) {
IWL_ERROR("Error adding AP address for transmit.\n"); IWL_ERR(priv, "Error adding AP address for transmit\n");
return -EIO; return -EIO;
} }
/* Init the hardware's rate fallback order based on the band */ /* Init the hardware's rate fallback order based on the band */
rc = iwl3945_init_hw_rate_table(priv); rc = iwl3945_init_hw_rate_table(priv);
if (rc) { if (rc) {
IWL_ERROR("Error setting HW rate table: %02X\n", rc); IWL_ERR(priv, "Error setting HW rate table: %02X\n", rc);
return -EIO; return -EIO;
} }
...@@ -1149,13 +1152,13 @@ static int iwl3945_add_sta_sync_callback(struct iwl_priv *priv, ...@@ -1149,13 +1152,13 @@ static int iwl3945_add_sta_sync_callback(struct iwl_priv *priv,
struct iwl_rx_packet *res = NULL; struct iwl_rx_packet *res = NULL;
if (!skb) { 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; return 1;
} }
res = (struct iwl_rx_packet *)skb->data; res = (struct iwl_rx_packet *)skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 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); res->hdr.flags);
return 1; return 1;
} }
...@@ -1195,7 +1198,7 @@ int iwl3945_send_add_station(struct iwl_priv *priv, ...@@ -1195,7 +1198,7 @@ int iwl3945_send_add_station(struct iwl_priv *priv,
res = (struct iwl_rx_packet *)cmd.meta.u.skb->data; res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { 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); res->hdr.flags);
rc = -EIO; rc = -EIO;
} }
...@@ -1302,7 +1305,7 @@ static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl_priv *priv) ...@@ -1302,7 +1305,7 @@ static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl_priv *priv)
if (list_empty(&priv->free_frames)) { if (list_empty(&priv->free_frames)) {
frame = kzalloc(sizeof(*frame), GFP_KERNEL); frame = kzalloc(sizeof(*frame), GFP_KERNEL);
if (!frame) { if (!frame) {
IWL_ERROR("Could not allocate frame!\n"); IWL_ERR(priv, "Could not allocate frame!\n");
return NULL; return NULL;
} }
...@@ -1373,7 +1376,7 @@ static int iwl3945_send_beacon_cmd(struct iwl_priv *priv) ...@@ -1373,7 +1376,7 @@ static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)
frame = iwl3945_get_free_frame(priv); frame = iwl3945_get_free_frame(priv);
if (!frame) { 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"); "command.\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -1437,14 +1440,14 @@ int iwl3945_eeprom_init(struct iwl_priv *priv) ...@@ -1437,14 +1440,14 @@ int iwl3945_eeprom_init(struct iwl_priv *priv)
BUILD_BUG_ON(sizeof(priv->eeprom39) != IWL_EEPROM_IMAGE_SIZE); BUILD_BUG_ON(sizeof(priv->eeprom39) != IWL_EEPROM_IMAGE_SIZE);
if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp); IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
return -ENOENT; return -ENOENT;
} }
/* Make sure driver (instead of uCode) is allowed to read EEPROM */ /* Make sure driver (instead of uCode) is allowed to read EEPROM */
ret = iwl3945_eeprom_acquire_semaphore(priv); ret = iwl3945_eeprom_acquire_semaphore(priv);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("Failed to acquire EEPROM semaphore.\n"); IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");
return -ENOENT; return -ENOENT;
} }
...@@ -1459,7 +1462,7 @@ int iwl3945_eeprom_init(struct iwl_priv *priv) ...@@ -1459,7 +1462,7 @@ int iwl3945_eeprom_init(struct iwl_priv *priv)
CSR_EEPROM_REG_READ_VALID_MSK, CSR_EEPROM_REG_READ_VALID_MSK,
IWL_EEPROM_ACCESS_TIMEOUT); IWL_EEPROM_ACCESS_TIMEOUT);
if (ret < 0) { if (ret < 0) {
IWL_ERROR("Time out reading EEPROM[%d]\n", addr); IWL_ERR(priv, "Time out reading EEPROM[%d]\n", addr);
return ret; return ret;
} }
...@@ -2120,7 +2123,7 @@ static void iwl3945_connection_init_rx_config(struct iwl_priv *priv, ...@@ -2120,7 +2123,7 @@ static void iwl3945_connection_init_rx_config(struct iwl_priv *priv,
RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK; RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
break; break;
default: default:
IWL_ERROR("Unsupported interface type %d\n", mode); IWL_ERR(priv, "Unsupported interface type %d\n", mode);
break; break;
} }
...@@ -2170,7 +2173,7 @@ static int iwl3945_set_mode(struct iwl_priv *priv, int mode) ...@@ -2170,7 +2173,7 @@ static int iwl3945_set_mode(struct iwl_priv *priv, int mode)
le16_to_cpu(priv->staging39_rxon.channel)); le16_to_cpu(priv->staging39_rxon.channel));
if (!ch_info || !is_channel_ibss(ch_info)) { if (!ch_info || !is_channel_ibss(ch_info)) {
IWL_ERROR("channel %d not IBSS channel\n", IWL_ERR(priv, "channel %d not IBSS channel\n",
le16_to_cpu(priv->staging39_rxon.channel)); le16_to_cpu(priv->staging39_rxon.channel));
return -EINVAL; return -EINVAL;
} }
...@@ -2403,7 +2406,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) ...@@ -2403,7 +2406,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
} }
if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) == IWL_INVALID_RATE) { if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) == IWL_INVALID_RATE) {
IWL_ERROR("ERROR: No TX rate available.\n"); IWL_ERR(priv, "ERROR: No TX rate available.\n");
goto drop_unlock; goto drop_unlock;
} }
...@@ -2603,7 +2606,7 @@ static void iwl3945_set_rate(struct iwl_priv *priv) ...@@ -2603,7 +2606,7 @@ static void iwl3945_set_rate(struct iwl_priv *priv)
sband = iwl3945_get_band(priv, priv->band); sband = iwl3945_get_band(priv, priv->band);
if (!sband) { if (!sband) {
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; return;
} }
...@@ -2836,7 +2839,7 @@ static int iwl3945_get_measurement(struct iwl_priv *priv, ...@@ -2836,7 +2839,7 @@ static int iwl3945_get_measurement(struct iwl_priv *priv,
res = (struct iwl_rx_packet *)cmd.meta.u.skb->data; res = (struct iwl_rx_packet *)cmd.meta.u.skb->data;
if (res->hdr.flags & IWL_CMD_FAILED_MSK) { if (res->hdr.flags & IWL_CMD_FAILED_MSK) {
IWL_ERROR("Bad return from REPLY_RX_ON_ASSOC command\n"); IWL_ERR(priv, "Bad return from REPLY_RX_ON_ASSOC command\n");
rc = -EIO; rc = -EIO;
} }
...@@ -2913,7 +2916,7 @@ static void iwl3945_rx_reply_error(struct iwl_priv *priv, ...@@ -2913,7 +2916,7 @@ static void iwl3945_rx_reply_error(struct iwl_priv *priv,
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)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", "seq 0x%04X ser 0x%08X\n",
le32_to_cpu(pkt->u.err_resp.error_type), le32_to_cpu(pkt->u.err_resp.error_type),
get_cmd_string(pkt->u.err_resp.cmd_id), get_cmd_string(pkt->u.err_resp.cmd_id),
...@@ -2985,7 +2988,7 @@ static void iwl3945_bg_beacon_update(struct work_struct *work) ...@@ -2985,7 +2988,7 @@ static void iwl3945_bg_beacon_update(struct work_struct *work)
beacon = ieee80211_beacon_get(priv->hw, priv->vif); beacon = ieee80211_beacon_get(priv->hw, priv->vif);
if (!beacon) { if (!beacon) {
IWL_ERROR("update beacon failed\n"); IWL_ERR(priv, "update beacon failed\n");
return; return;
} }
...@@ -3232,7 +3235,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv, ...@@ -3232,7 +3235,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv,
int nfreed = 0; int nfreed = 0;
if ((index >= q->n_bd) || (iwl3945_x2_queue_used(q, index) == 0)) { if ((index >= q->n_bd) || (iwl3945_x2_queue_used(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, "is out of range [0-%d] %d %d.\n", txq_id,
index, q->n_bd, q->write_ptr, q->read_ptr); index, q->n_bd, q->write_ptr, q->read_ptr);
return; return;
...@@ -3241,7 +3244,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv, ...@@ -3241,7 +3244,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv,
for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index; for (index = iwl_queue_inc_wrap(index, q->n_bd); q->read_ptr != index;
q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) { q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
if (nfreed > 1) { if (nfreed > 1) {
IWL_ERROR("HCMD skipped: index (%d) %d %d\n", index, IWL_ERR(priv, "HCMD skipped: index (%d) %d %d\n", index,
q->write_ptr, q->read_ptr); q->write_ptr, q->read_ptr);
queue_work(priv->workqueue, &priv->restart); queue_work(priv->workqueue, &priv->restart);
break; break;
...@@ -3955,7 +3958,7 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv) ...@@ -3955,7 +3958,7 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
base = le32_to_cpu(priv->card_alive.error_event_table_ptr); base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
if (!iwl3945_hw_valid_rtc_data_addr(base)) { if (!iwl3945_hw_valid_rtc_data_addr(base)) {
IWL_ERROR("Not valid error log pointer 0x%08X\n", base); IWL_ERR(priv, "Not valid error log pointer 0x%08X\n", base);
return; return;
} }
...@@ -3968,11 +3971,12 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv) ...@@ -3968,11 +3971,12 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
count = iwl_read_targ_mem(priv, base); count = iwl_read_targ_mem(priv, base);
if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
IWL_ERROR("Start IWL Error Log Dump:\n"); IWL_ERR(priv, "Start IWL Error Log Dump:\n");
IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count); IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",
priv->status, count);
} }
IWL_ERROR("Desc Time asrtPC blink2 " IWL_ERR(priv, "Desc Time asrtPC blink2 "
"ilink1 nmiPC Line\n"); "ilink1 nmiPC Line\n");
for (i = ERROR_START_OFFSET; for (i = ERROR_START_OFFSET;
i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET; i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;
...@@ -3991,10 +3995,10 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv) ...@@ -3991,10 +3995,10 @@ static void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
data1 = data1 =
iwl_read_targ_mem(priv, base + i + 6 * sizeof(u32)); iwl_read_targ_mem(priv, base + i + 6 * sizeof(u32));
IWL_ERROR IWL_ERR(priv,
("%-13s (#%d) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n", "%-13s (#%d) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
desc_lookup(desc), desc, time, blink1, blink2, desc_lookup(desc), desc, time, blink1, blink2,
ilink1, ilink2, data1); ilink1, ilink2, data1);
} }
iwl_release_nic_access(priv); iwl_release_nic_access(priv);
...@@ -4036,12 +4040,13 @@ static void iwl3945_print_event_log(struct iwl_priv *priv, u32 start_idx, ...@@ -4036,12 +4040,13 @@ static void iwl3945_print_event_log(struct iwl_priv *priv, u32 start_idx,
ptr += sizeof(u32); ptr += sizeof(u32);
time = iwl_read_targ_mem(priv, ptr); time = iwl_read_targ_mem(priv, ptr);
ptr += sizeof(u32); ptr += sizeof(u32);
if (mode == 0) if (mode == 0) {
IWL_ERROR("0x%08x\t%04u\n", time, ev); /* data, ev */ /* data, ev */
else { IWL_ERR(priv, "0x%08x\t%04u\n", time, ev);
} else {
data = iwl_read_targ_mem(priv, ptr); data = iwl_read_targ_mem(priv, ptr);
ptr += sizeof(u32); ptr += sizeof(u32);
IWL_ERROR("%010u\t0x%08x\t%04u\n", time, data, ev); IWL_ERR(priv, "%010u\t0x%08x\t%04u\n", time, data, ev);
} }
} }
} }
...@@ -4058,7 +4063,7 @@ static void iwl3945_dump_nic_event_log(struct iwl_priv *priv) ...@@ -4058,7 +4063,7 @@ static void iwl3945_dump_nic_event_log(struct iwl_priv *priv)
base = le32_to_cpu(priv->card_alive.log_event_table_ptr); base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
if (!iwl3945_hw_valid_rtc_data_addr(base)) { if (!iwl3945_hw_valid_rtc_data_addr(base)) {
IWL_ERROR("Invalid event log pointer 0x%08X\n", base); IWL_ERR(priv, "Invalid event log pointer 0x%08X\n", base);
return; return;
} }
...@@ -4078,12 +4083,12 @@ static void iwl3945_dump_nic_event_log(struct iwl_priv *priv) ...@@ -4078,12 +4083,12 @@ static void iwl3945_dump_nic_event_log(struct iwl_priv *priv)
/* bail out if nothing in log */ /* bail out if nothing in log */
if (size == 0) { if (size == 0) {
IWL_ERROR("Start IWL Event Log Dump: nothing in log\n"); IWL_ERR(priv, "Start IWL Event Log Dump: nothing in log\n");
iwl_release_nic_access(priv); iwl_release_nic_access(priv);
return; return;
} }
IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n", IWL_ERR(priv, "Start IWL Event Log Dump: display count %d, wraps %d\n",
size, num_wraps); size, num_wraps);
/* if uCode has wrapped back to top of log, start at the oldest entry, /* if uCode has wrapped back to top of log, start at the oldest entry,
...@@ -4196,7 +4201,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) ...@@ -4196,7 +4201,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv)
/* Now service all interrupt bits discovered above. */ /* Now service all interrupt bits discovered above. */
if (inta & CSR_INT_BIT_HW_ERR) { 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 */ /* Tell the device to stop sending interrupts */
iwl3945_disable_interrupts(priv); iwl3945_disable_interrupts(priv);
...@@ -4227,8 +4232,8 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) ...@@ -4227,8 +4232,8 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv)
/* Error detected by uCode */ /* Error detected by uCode */
if (inta & CSR_INT_BIT_SW_ERR) { if (inta & CSR_INT_BIT_SW_ERR) {
IWL_ERROR("Microcode SW error detected. Restarting 0x%X.\n", IWL_ERR(priv, "Microcode SW error detected. "
inta); "Restarting 0x%X.\n", inta);
iwl3945_irq_handle_error(priv); iwl3945_irq_handle_error(priv);
handled |= CSR_INT_BIT_SW_ERR; handled |= CSR_INT_BIT_SW_ERR;
} }
...@@ -4268,7 +4273,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) ...@@ -4268,7 +4273,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv)
} }
if (inta & ~handled) 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) { if (inta & ~CSR_INI_SET_MASK) {
IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n", IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
...@@ -4510,7 +4515,7 @@ static int iwl3945_init_channel_map(struct iwl_priv *priv) ...@@ -4510,7 +4515,7 @@ static int iwl3945_init_channel_map(struct iwl_priv *priv)
priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) * priv->channel_info = kzalloc(sizeof(struct iwl_channel_info) *
priv->channel_count, GFP_KERNEL); priv->channel_count, GFP_KERNEL);
if (!priv->channel_info) { if (!priv->channel_info) {
IWL_ERROR("Could not allocate channel_info\n"); IWL_ERR(priv, "Could not allocate channel_info\n");
priv->channel_count = 0; priv->channel_count = 0;
return -ENOMEM; return -ENOMEM;
} }
...@@ -4949,7 +4954,7 @@ static int iwl3945_verify_inst_full(struct iwl_priv *priv, __le32 *image, u32 le ...@@ -4949,7 +4954,7 @@ static int iwl3945_verify_inst_full(struct iwl_priv *priv, __le32 *image, u32 le
* if IWL_DL_IO is set */ * if IWL_DL_IO is set */
val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image)) {
IWL_ERROR("uCode INST section is invalid at " IWL_ERR(priv, "uCode INST section is invalid at "
"offset 0x%x, is 0x%x, s/b 0x%x\n", "offset 0x%x, is 0x%x, s/b 0x%x\n",
save_len - len, val, le32_to_cpu(*image)); save_len - len, val, le32_to_cpu(*image));
rc = -EIO; rc = -EIO;
...@@ -4995,7 +5000,7 @@ static int iwl3945_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 ...@@ -4995,7 +5000,7 @@ static int iwl3945_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32
val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image)) {
#if 0 /* Enable this if you want to see details */ #if 0 /* Enable this if you want to see details */
IWL_ERROR("uCode INST section is invalid at " IWL_ERR(priv, "uCode INST section is invalid at "
"offset 0x%x, is 0x%x, s/b 0x%x\n", "offset 0x%x, is 0x%x, s/b 0x%x\n",
i, val, *image); i, val, *image);
#endif #endif
...@@ -5049,7 +5054,7 @@ static int iwl3945_verify_ucode(struct iwl_priv *priv) ...@@ -5049,7 +5054,7 @@ static int iwl3945_verify_ucode(struct iwl_priv *priv)
return 0; return 0;
} }
IWL_ERROR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n"); IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
/* Since nothing seems to match, show first several data entries in /* Since nothing seems to match, show first several data entries in
* instruction SRAM, so maybe visual inspection will give a clue. * instruction SRAM, so maybe visual inspection will give a clue.
...@@ -5079,7 +5084,7 @@ static int iwl3945_verify_bsm(struct iwl_priv *priv) ...@@ -5079,7 +5084,7 @@ static int iwl3945_verify_bsm(struct iwl_priv *priv)
reg += sizeof(u32), image++) { reg += sizeof(u32), image++) {
val = iwl_read_prph(priv, reg); val = iwl_read_prph(priv, reg);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image)) {
IWL_ERROR("BSM uCode verification failed at " IWL_ERR(priv, "BSM uCode verification failed at "
"addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n", "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
BSM_SRAM_LOWER_BOUND, BSM_SRAM_LOWER_BOUND,
reg - BSM_SRAM_LOWER_BOUND, len, reg - BSM_SRAM_LOWER_BOUND, len,
...@@ -5197,7 +5202,7 @@ static int iwl3945_load_bsm(struct iwl_priv *priv) ...@@ -5197,7 +5202,7 @@ static int iwl3945_load_bsm(struct iwl_priv *priv)
if (i < 100) if (i < 100)
IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i); IWL_DEBUG_INFO("BSM write complete, poll %d iterations\n", i);
else { else {
IWL_ERROR("BSM write did not complete!\n"); IWL_ERR(priv, "BSM write did not complete!\n");
return -EIO; return -EIO;
} }
...@@ -5242,7 +5247,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) ...@@ -5242,7 +5247,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
sprintf(buf, "%s%u%s", name_pre, index, ".ucode"); sprintf(buf, "%s%u%s", name_pre, index, ".ucode");
ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev); ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev);
if (ret < 0) { 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); buf, ret);
if (ret == -ENOENT) if (ret == -ENOENT)
continue; continue;
...@@ -5250,7 +5255,9 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) ...@@ -5250,7 +5255,9 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
goto error; goto error;
} else { } else {
if (index < api_max) 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); buf, api_max);
IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n", IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n",
buf, ucode_raw->size); buf, ucode_raw->size);
...@@ -5263,7 +5270,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) ...@@ -5263,7 +5270,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
/* Make sure that we got at least our header! */ /* Make sure that we got at least our header! */
if (ucode_raw->size < sizeof(*ucode)) { 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; ret = -EINVAL;
goto err_release; goto err_release;
} }
...@@ -5284,7 +5291,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) ...@@ -5284,7 +5291,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
* on the API version read from firware header from here on forward */ * on the API version read from firware header from here on forward */
if (api_ver < api_min || api_ver > api_max) { 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", "Driver supports v%u, firmware is v%u.\n",
api_max, api_ver); api_max, api_ver);
priv->ucode_ver = 0; priv->ucode_ver = 0;
...@@ -5292,7 +5299,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) ...@@ -5292,7 +5299,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
goto err_release; goto err_release;
} }
if (api_ver != api_max) if (api_ver != api_max)
IWL_ERROR("Firmware has old API version. Expected %u, " IWL_ERR(priv, "Firmware has old API version. Expected %u, "
"got %u. New firmware can be obtained " "got %u. New firmware can be obtained "
"from http://www.intellinuxwireless.org.\n", "from http://www.intellinuxwireless.org.\n",
api_max, api_ver); api_max, api_ver);
...@@ -5443,7 +5450,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv) ...@@ -5443,7 +5450,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
return 0; return 0;
err_pci_alloc: err_pci_alloc:
IWL_ERROR("failed to allocate pci memory\n"); IWL_ERR(priv, "failed to allocate pci memory\n");
ret = -ENOMEM; ret = -ENOMEM;
iwl3945_dealloc_ucode_pci(priv); iwl3945_dealloc_ucode_pci(priv);
...@@ -5795,7 +5802,7 @@ static int __iwl3945_up(struct iwl_priv *priv) ...@@ -5795,7 +5802,7 @@ static int __iwl3945_up(struct iwl_priv *priv)
} }
if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) { if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
IWL_ERROR("ucode not available for device bring up\n"); IWL_ERR(priv, "ucode not available for device bring up\n");
return -EIO; return -EIO;
} }
...@@ -5815,7 +5822,7 @@ static int __iwl3945_up(struct iwl_priv *priv) ...@@ -5815,7 +5822,7 @@ static int __iwl3945_up(struct iwl_priv *priv)
rc = iwl3945_hw_nic_init(priv); rc = iwl3945_hw_nic_init(priv);
if (rc) { if (rc) {
IWL_ERROR("Unable to int nic\n"); IWL_ERR(priv, "Unable to int nic\n");
return rc; return rc;
} }
...@@ -5852,7 +5859,8 @@ static int __iwl3945_up(struct iwl_priv *priv) ...@@ -5852,7 +5859,8 @@ static int __iwl3945_up(struct iwl_priv *priv)
rc = iwl3945_load_bsm(priv); rc = iwl3945_load_bsm(priv);
if (rc) { if (rc) {
IWL_ERROR("Unable to set up bootstrap uCode: %d\n", rc); IWL_ERR(priv,
"Unable to set up bootstrap uCode: %d\n", rc);
continue; continue;
} }
...@@ -5870,7 +5878,7 @@ static int __iwl3945_up(struct iwl_priv *priv) ...@@ -5870,7 +5878,7 @@ static int __iwl3945_up(struct iwl_priv *priv)
/* tried to restart and config the device for as long as our /* tried to restart and config the device for as long as our
* patience could withstand */ * 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; return -EIO;
} }
...@@ -6203,7 +6211,7 @@ static void iwl3945_post_associate(struct iwl_priv *priv) ...@@ -6203,7 +6211,7 @@ static void iwl3945_post_associate(struct iwl_priv *priv)
struct ieee80211_conf *conf = NULL; struct ieee80211_conf *conf = NULL;
if (priv->iw_mode == NL80211_IFTYPE_AP) { 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; return;
} }
...@@ -6276,7 +6284,7 @@ static void iwl3945_post_associate(struct iwl_priv *priv) ...@@ -6276,7 +6284,7 @@ static void iwl3945_post_associate(struct iwl_priv *priv)
break; break;
default: 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); __func__, priv->iw_mode);
break; break;
} }
...@@ -6342,7 +6350,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw) ...@@ -6342,7 +6350,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
if (pci_enable_device(priv->pci_dev)) { 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; return -ENODEV;
} }
pci_restore_state(priv->pci_dev); pci_restore_state(priv->pci_dev);
...@@ -6351,7 +6359,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw) ...@@ -6351,7 +6359,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
ret = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED, ret = request_irq(priv->pci_dev->irq, iwl3945_isr, IRQF_SHARED,
DRV_NAME, priv); DRV_NAME, priv);
if (ret) { 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; goto out_disable_msi;
} }
...@@ -6365,7 +6373,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw) ...@@ -6365,7 +6373,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
if (!priv->ucode_code.len) { if (!priv->ucode_code.len) {
ret = iwl3945_read_ucode(priv); ret = iwl3945_read_ucode(priv);
if (ret) { 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); mutex_unlock(&priv->mutex);
goto out_release_irq; goto out_release_irq;
} }
...@@ -6392,8 +6400,9 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw) ...@@ -6392,8 +6400,9 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
UCODE_READY_TIMEOUT); UCODE_READY_TIMEOUT);
if (!ret) { if (!ret) {
if (!test_bit(STATUS_READY, &priv->status)) { if (!test_bit(STATUS_READY, &priv->status)) {
IWL_ERROR("Wait for START_ALIVE timeout after %dms.\n", IWL_ERR(priv,
jiffies_to_msecs(UCODE_READY_TIMEOUT)); "Wait for START_ALIVE timeout after %dms.\n",
jiffies_to_msecs(UCODE_READY_TIMEOUT));
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out_release_irq; goto out_release_irq;
} }
...@@ -7738,8 +7747,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7738,8 +7747,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
if ((iwl3945_param_queues_num > IWL39_MAX_NUM_QUEUES) || if ((iwl3945_param_queues_num > IWL39_MAX_NUM_QUEUES) ||
(iwl3945_param_queues_num < IWL_MIN_NUM_QUEUES)) { (iwl3945_param_queues_num < IWL_MIN_NUM_QUEUES)) {
IWL_ERROR("invalid queues_num, should be between %d and %d\n", IWL_ERR(priv,
IWL_MIN_NUM_QUEUES, IWL39_MAX_NUM_QUEUES); "invalid queues_num, should be between %d and %d\n",
IWL_MIN_NUM_QUEUES, IWL39_MAX_NUM_QUEUES);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
...@@ -7833,7 +7843,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7833,7 +7843,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
/* Read the EEPROM */ /* Read the EEPROM */
err = iwl3945_eeprom_init(priv); err = iwl3945_eeprom_init(priv);
if (err) { if (err) {
IWL_ERROR("Unable to init EEPROM\n"); IWL_ERR(priv, "Unable to init EEPROM\n");
goto out_remove_sysfs; goto out_remove_sysfs;
} }
/* MAC Address location in EEPROM same for 3945/4965 */ /* MAC Address location in EEPROM same for 3945/4965 */
...@@ -7846,7 +7856,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7846,7 +7856,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
* ********************/ * ********************/
/* Device-specific setup */ /* Device-specific setup */
if (iwl3945_hw_set_hw_params(priv)) { if (iwl3945_hw_set_hw_params(priv)) {
IWL_ERROR("failed to set hw settings\n"); IWL_ERR(priv, "failed to set hw settings\n");
goto out_iounmap; goto out_iounmap;
} }
...@@ -7887,13 +7897,13 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7887,13 +7897,13 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
err = iwl3945_init_channel_map(priv); err = iwl3945_init_channel_map(priv);
if (err) { if (err) {
IWL_ERROR("initializing regulatory failed: %d\n", err); IWL_ERR(priv, "initializing regulatory failed: %d\n", err);
goto out_release_irq; goto out_release_irq;
} }
err = iwl3945_init_geos(priv); err = iwl3945_init_geos(priv);
if (err) { if (err) {
IWL_ERROR("initializing geos failed: %d\n", err); IWL_ERR(priv, "initializing geos failed: %d\n", err);
goto out_free_channel_map; goto out_free_channel_map;
} }
...@@ -7922,7 +7932,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7922,7 +7932,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group); err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
if (err) { if (err) {
IWL_ERROR("failed to create sysfs device attributes\n"); IWL_ERR(priv, "failed to create sysfs device attributes\n");
goto out_free_geos; goto out_free_geos;
} }
...@@ -7942,7 +7952,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7942,7 +7952,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
err = ieee80211_register_hw(priv->hw); err = ieee80211_register_hw(priv->hw);
if (err) { if (err) {
IWL_ERROR("Failed to register network device (error %d)\n", err); IWL_ERR(priv, "Failed to register network device: %d\n", err);
goto out_remove_sysfs; goto out_remove_sysfs;
} }
...@@ -7952,7 +7962,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7952,7 +7962,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
err = iwl3945_rfkill_init(priv); err = iwl3945_rfkill_init(priv);
if (err) if (err)
IWL_ERROR("Unable to initialize RFKILL system. " IWL_ERR(priv, "Unable to initialize RFKILL system. "
"Ignoring error: %d\n", err); "Ignoring error: %d\n", err);
return 0; return 0;
...@@ -8124,7 +8134,7 @@ int iwl3945_rfkill_init(struct iwl_priv *priv) ...@@ -8124,7 +8134,7 @@ int iwl3945_rfkill_init(struct iwl_priv *priv)
IWL_DEBUG_RF_KILL("Initializing RFKILL.\n"); IWL_DEBUG_RF_KILL("Initializing RFKILL.\n");
priv->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN); priv->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
if (!priv->rfkill) { if (!priv->rfkill) {
IWL_ERROR("Unable to allocate rfkill device.\n"); IWL_ERR(priv, "Unable to allocate rfkill device.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
} }
...@@ -8140,7 +8150,7 @@ int iwl3945_rfkill_init(struct iwl_priv *priv) ...@@ -8140,7 +8150,7 @@ int iwl3945_rfkill_init(struct iwl_priv *priv)
ret = rfkill_register(priv->rfkill); ret = rfkill_register(priv->rfkill);
if (ret) { if (ret) {
IWL_ERROR("Unable to register rfkill: %d\n", ret); IWL_ERR(priv, "Unable to register rfkill: %d\n", ret);
goto freed_rfkill; goto freed_rfkill;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7