diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-18 16:07:57 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 05:21:47 -0500 |
commit | 9406f79775a5374b932ac45ae9e84a71032a9d33 (patch) | |
tree | f832668c069682fb7d55c0b514aff97fe0e03b11 /drivers/net/wireless/iwlegacy/iwl-core.c | |
parent | 58de00a464f1e7cf0b108341dc6cc49276d19d7a (diff) |
iwlegacy: remove il argument from IWL_ERR/INFO/WARN/CRIT
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c index e6c7e9d87a61..42be833bdc75 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.c +++ b/drivers/net/wireless/iwlegacy/iwl-core.c | |||
@@ -253,14 +253,14 @@ int il_init_geos(struct il_priv *il) | |||
253 | 253 | ||
254 | if ((il->bands[IEEE80211_BAND_5GHZ].n_channels == 0) && | 254 | if ((il->bands[IEEE80211_BAND_5GHZ].n_channels == 0) && |
255 | il->cfg->sku & IL_SKU_A) { | 255 | il->cfg->sku & IL_SKU_A) { |
256 | IL_INFO(il, "Incorrectly detected BG card as ABG. " | 256 | IL_INFO("Incorrectly detected BG card as ABG. " |
257 | "Please send your PCI ID 0x%04X:0x%04X to maintainer.\n", | 257 | "Please send your PCI ID 0x%04X:0x%04X to maintainer.\n", |
258 | il->pci_dev->device, | 258 | il->pci_dev->device, |
259 | il->pci_dev->subsystem_device); | 259 | il->pci_dev->subsystem_device); |
260 | il->cfg->sku &= ~IL_SKU_A; | 260 | il->cfg->sku &= ~IL_SKU_A; |
261 | } | 261 | } |
262 | 262 | ||
263 | IL_INFO(il, "Tunable channels: %d 802.11bg, %d 802.11a channels\n", | 263 | IL_INFO("Tunable channels: %d 802.11bg, %d 802.11a channels\n", |
264 | il->bands[IEEE80211_BAND_2GHZ].n_channels, | 264 | il->bands[IEEE80211_BAND_2GHZ].n_channels, |
265 | il->bands[IEEE80211_BAND_5GHZ].n_channels); | 265 | il->bands[IEEE80211_BAND_5GHZ].n_channels); |
266 | 266 | ||
@@ -431,65 +431,65 @@ il_check_rxon_cmd(struct il_priv *il, struct il_rxon_context *ctx) | |||
431 | 431 | ||
432 | if (rxon->flags & RXON_FLG_BAND_24G_MSK) { | 432 | if (rxon->flags & RXON_FLG_BAND_24G_MSK) { |
433 | if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) { | 433 | if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) { |
434 | IL_WARN(il, "check 2.4G: wrong narrow\n"); | 434 | IL_WARN("check 2.4G: wrong narrow\n"); |
435 | error = true; | 435 | error = true; |
436 | } | 436 | } |
437 | if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) { | 437 | if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) { |
438 | IL_WARN(il, "check 2.4G: wrong radar\n"); | 438 | IL_WARN("check 2.4G: wrong radar\n"); |
439 | error = true; | 439 | error = true; |
440 | } | 440 | } |
441 | } else { | 441 | } else { |
442 | if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) { | 442 | if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) { |
443 | IL_WARN(il, "check 5.2G: not short slot!\n"); | 443 | IL_WARN("check 5.2G: not short slot!\n"); |
444 | error = true; | 444 | error = true; |
445 | } | 445 | } |
446 | if (rxon->flags & RXON_FLG_CCK_MSK) { | 446 | if (rxon->flags & RXON_FLG_CCK_MSK) { |
447 | IL_WARN(il, "check 5.2G: CCK!\n"); | 447 | IL_WARN("check 5.2G: CCK!\n"); |
448 | error = true; | 448 | error = true; |
449 | } | 449 | } |
450 | } | 450 | } |
451 | if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) { | 451 | if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) { |
452 | IL_WARN(il, "mac/bssid mcast!\n"); | 452 | IL_WARN("mac/bssid mcast!\n"); |
453 | error = true; | 453 | error = true; |
454 | } | 454 | } |
455 | 455 | ||
456 | /* make sure basic rates 6Mbps and 1Mbps are supported */ | 456 | /* make sure basic rates 6Mbps and 1Mbps are supported */ |
457 | if ((rxon->ofdm_basic_rates & IL_RATE_6M_MASK) == 0 && | 457 | if ((rxon->ofdm_basic_rates & IL_RATE_6M_MASK) == 0 && |
458 | (rxon->cck_basic_rates & IL_RATE_1M_MASK) == 0) { | 458 | (rxon->cck_basic_rates & IL_RATE_1M_MASK) == 0) { |
459 | IL_WARN(il, "neither 1 nor 6 are basic\n"); | 459 | IL_WARN("neither 1 nor 6 are basic\n"); |
460 | error = true; | 460 | error = true; |
461 | } | 461 | } |
462 | 462 | ||
463 | if (le16_to_cpu(rxon->assoc_id) > 2007) { | 463 | if (le16_to_cpu(rxon->assoc_id) > 2007) { |
464 | IL_WARN(il, "aid > 2007\n"); | 464 | IL_WARN("aid > 2007\n"); |
465 | error = true; | 465 | error = true; |
466 | } | 466 | } |
467 | 467 | ||
468 | if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) | 468 | if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) |
469 | == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) { | 469 | == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) { |
470 | IL_WARN(il, "CCK and short slot\n"); | 470 | IL_WARN("CCK and short slot\n"); |
471 | error = true; | 471 | error = true; |
472 | } | 472 | } |
473 | 473 | ||
474 | if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) | 474 | if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) |
475 | == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) { | 475 | == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) { |
476 | IL_WARN(il, "CCK and auto detect"); | 476 | IL_WARN("CCK and auto detect"); |
477 | error = true; | 477 | error = true; |
478 | } | 478 | } |
479 | 479 | ||
480 | if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK | | 480 | if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK | |
481 | RXON_FLG_TGG_PROTECT_MSK)) == | 481 | RXON_FLG_TGG_PROTECT_MSK)) == |
482 | RXON_FLG_TGG_PROTECT_MSK) { | 482 | RXON_FLG_TGG_PROTECT_MSK) { |
483 | IL_WARN(il, "TGg but no auto-detect\n"); | 483 | IL_WARN("TGg but no auto-detect\n"); |
484 | error = true; | 484 | error = true; |
485 | } | 485 | } |
486 | 486 | ||
487 | if (error) | 487 | if (error) |
488 | IL_WARN(il, "Tuning to channel %d\n", | 488 | IL_WARN("Tuning to channel %d\n", |
489 | le16_to_cpu(rxon->channel)); | 489 | le16_to_cpu(rxon->channel)); |
490 | 490 | ||
491 | if (error) { | 491 | if (error) { |
492 | IL_ERR(il, "Invalid RXON\n"); | 492 | IL_ERR("Invalid RXON\n"); |
493 | return -EINVAL; | 493 | return -EINVAL; |
494 | } | 494 | } |
495 | return 0; | 495 | return 0; |
@@ -626,7 +626,7 @@ static void _il_set_rxon_ht(struct il_priv *il, | |||
626 | case IEEE80211_HT_PARAM_CHA_SEC_NONE: | 626 | case IEEE80211_HT_PARAM_CHA_SEC_NONE: |
627 | default: | 627 | default: |
628 | /* channel location only valid if in Mixed mode */ | 628 | /* channel location only valid if in Mixed mode */ |
629 | IL_ERR(il, | 629 | IL_ERR( |
630 | "invalid extension channel offset\n"); | 630 | "invalid extension channel offset\n"); |
631 | break; | 631 | break; |
632 | } | 632 | } |
@@ -778,7 +778,7 @@ void il_connection_init_rx_config(struct il_priv *il, | |||
778 | break; | 778 | break; |
779 | 779 | ||
780 | default: | 780 | default: |
781 | IL_ERR(il, "Unsupported interface type %d\n", | 781 | IL_ERR("Unsupported interface type %d\n", |
782 | ctx->vif->type); | 782 | ctx->vif->type); |
783 | break; | 783 | break; |
784 | } | 784 | } |
@@ -828,7 +828,7 @@ void il_set_rate(struct il_priv *il) | |||
828 | 828 | ||
829 | hw = il_get_hw_mode(il, il->band); | 829 | hw = il_get_hw_mode(il, il->band); |
830 | if (!hw) { | 830 | if (!hw) { |
831 | IL_ERR(il, "Failed to set rate: unable to get hw mode\n"); | 831 | IL_ERR("Failed to set rate: unable to get hw mode\n"); |
832 | return; | 832 | return; |
833 | } | 833 | } |
834 | 834 | ||
@@ -882,7 +882,7 @@ void il_rx_csa(struct il_priv *il, struct il_rx_mem_buffer *rxb) | |||
882 | le16_to_cpu(csa->channel)); | 882 | le16_to_cpu(csa->channel)); |
883 | il_chswitch_done(il, true); | 883 | il_chswitch_done(il, true); |
884 | } else { | 884 | } else { |
885 | IL_ERR(il, "CSA notif (fail) : channel %d\n", | 885 | IL_ERR("CSA notif (fail) : channel %d\n", |
886 | le16_to_cpu(csa->channel)); | 886 | le16_to_cpu(csa->channel)); |
887 | il_chswitch_done(il, false); | 887 | il_chswitch_done(il, false); |
888 | } | 888 | } |
@@ -925,7 +925,7 @@ void il_irq_handle_error(struct il_priv *il) | |||
925 | /* Cancel currently queued command. */ | 925 | /* Cancel currently queued command. */ |
926 | clear_bit(STATUS_HCMD_ACTIVE, &il->status); | 926 | clear_bit(STATUS_HCMD_ACTIVE, &il->status); |
927 | 927 | ||
928 | IL_ERR(il, "Loaded firmware version: %s\n", | 928 | IL_ERR("Loaded firmware version: %s\n", |
929 | il->hw->wiphy->fw_version); | 929 | il->hw->wiphy->fw_version); |
930 | 930 | ||
931 | il->cfg->ops->lib->dump_nic_error_log(il); | 931 | il->cfg->ops->lib->dump_nic_error_log(il); |
@@ -963,7 +963,7 @@ static int il_apm_stop_master(struct il_priv *il) | |||
963 | ret = il_poll_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED, | 963 | ret = il_poll_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED, |
964 | CSR_RESET_REG_FLAG_MASTER_DISABLED, 100); | 964 | CSR_RESET_REG_FLAG_MASTER_DISABLED, 100); |
965 | if (ret) | 965 | if (ret) |
966 | IL_WARN(il, "Master Disable Timed Out, 100 usec\n"); | 966 | IL_WARN("Master Disable Timed Out, 100 usec\n"); |
967 | 967 | ||
968 | D_INFO("stop master\n"); | 968 | D_INFO("stop master\n"); |
969 | 969 | ||
@@ -1123,14 +1123,14 @@ int il_set_tx_power(struct il_priv *il, s8 tx_power, bool force) | |||
1123 | 1123 | ||
1124 | /* 0 dBm mean 1 milliwatt */ | 1124 | /* 0 dBm mean 1 milliwatt */ |
1125 | if (tx_power < 0) { | 1125 | if (tx_power < 0) { |
1126 | IL_WARN(il, | 1126 | IL_WARN( |
1127 | "Requested user TXPOWER %d below 1 mW.\n", | 1127 | "Requested user TXPOWER %d below 1 mW.\n", |
1128 | tx_power); | 1128 | tx_power); |
1129 | return -EINVAL; | 1129 | return -EINVAL; |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | if (tx_power > il->tx_power_device_lmt) { | 1132 | if (tx_power > il->tx_power_device_lmt) { |
1133 | IL_WARN(il, | 1133 | IL_WARN( |
1134 | "Requested user TXPOWER %d above upper limit %d.\n", | 1134 | "Requested user TXPOWER %d above upper limit %d.\n", |
1135 | tx_power, il->tx_power_device_lmt); | 1135 | tx_power, il->tx_power_device_lmt); |
1136 | return -EINVAL; | 1136 | return -EINVAL; |
@@ -1184,7 +1184,7 @@ void il_send_bt_config(struct il_priv *il) | |||
1184 | 1184 | ||
1185 | if (il_send_cmd_pdu(il, REPLY_BT_CONFIG, | 1185 | if (il_send_cmd_pdu(il, REPLY_BT_CONFIG, |
1186 | sizeof(struct il_bt_cmd), &bt_cmd)) | 1186 | sizeof(struct il_bt_cmd), &bt_cmd)) |
1187 | IL_ERR(il, "failed to send BT Coex Config\n"); | 1187 | IL_ERR("failed to send BT Coex Config\n"); |
1188 | } | 1188 | } |
1189 | EXPORT_SYMBOL(il_send_bt_config); | 1189 | EXPORT_SYMBOL(il_send_bt_config); |
1190 | 1190 | ||
@@ -1235,7 +1235,7 @@ void il_rx_reply_error(struct il_priv *il, | |||
1235 | { | 1235 | { |
1236 | struct il_rx_packet *pkt = rxb_addr(rxb); | 1236 | struct il_rx_packet *pkt = rxb_addr(rxb); |
1237 | 1237 | ||
1238 | IL_ERR(il, "Error Reply type 0x%08X cmd %s (0x%02X) " | 1238 | IL_ERR("Error Reply type 0x%08X cmd %s (0x%02X) " |
1239 | "seq 0x%04X ser 0x%08X\n", | 1239 | "seq 0x%04X ser 0x%08X\n", |
1240 | le32_to_cpu(pkt->u.err_resp.error_type), | 1240 | le32_to_cpu(pkt->u.err_resp.error_type), |
1241 | il_get_cmd_string(pkt->u.err_resp.cmd_id), | 1241 | il_get_cmd_string(pkt->u.err_resp.cmd_id), |
@@ -1354,7 +1354,7 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) | |||
1354 | mutex_lock(&il->mutex); | 1354 | mutex_lock(&il->mutex); |
1355 | 1355 | ||
1356 | if (!il_is_ready_rf(il)) { | 1356 | if (!il_is_ready_rf(il)) { |
1357 | IL_WARN(il, "Try to add interface when device not ready\n"); | 1357 | IL_WARN("Try to add interface when device not ready\n"); |
1358 | err = -EINVAL; | 1358 | err = -EINVAL; |
1359 | goto out; | 1359 | goto out; |
1360 | } | 1360 | } |
@@ -1454,7 +1454,7 @@ int il_alloc_txq_mem(struct il_priv *il) | |||
1454 | il->cfg->base_params->num_of_queues, | 1454 | il->cfg->base_params->num_of_queues, |
1455 | GFP_KERNEL); | 1455 | GFP_KERNEL); |
1456 | if (!il->txq) { | 1456 | if (!il->txq) { |
1457 | IL_ERR(il, "Not enough memory for txq\n"); | 1457 | IL_ERR("Not enough memory for txq\n"); |
1458 | return -ENOMEM; | 1458 | return -ENOMEM; |
1459 | } | 1459 | } |
1460 | return 0; | 1460 | return 0; |
@@ -1743,7 +1743,7 @@ int il_force_reset(struct il_priv *il, bool external) | |||
1743 | return 0; | 1743 | return 0; |
1744 | } | 1744 | } |
1745 | 1745 | ||
1746 | IL_ERR(il, "On demand firmware reload\n"); | 1746 | IL_ERR("On demand firmware reload\n"); |
1747 | 1747 | ||
1748 | /* Set the FW error flag -- cleared on il_down */ | 1748 | /* Set the FW error flag -- cleared on il_down */ |
1749 | set_bit(STATUS_FW_ERROR, &il->status); | 1749 | set_bit(STATUS_FW_ERROR, &il->status); |
@@ -1847,7 +1847,7 @@ static int il_check_stuck_queue(struct il_priv *il, int cnt) | |||
1847 | msecs_to_jiffies(il->cfg->base_params->wd_timeout); | 1847 | msecs_to_jiffies(il->cfg->base_params->wd_timeout); |
1848 | 1848 | ||
1849 | if (time_after(jiffies, timeout)) { | 1849 | if (time_after(jiffies, timeout)) { |
1850 | IL_ERR(il, "Queue %d stuck for %u ms.\n", | 1850 | IL_ERR("Queue %d stuck for %u ms.\n", |
1851 | q->id, il->cfg->base_params->wd_timeout); | 1851 | q->id, il->cfg->base_params->wd_timeout); |
1852 | ret = il_force_reset(il, false); | 1852 | ret = il_force_reset(il, false); |
1853 | return (ret == -EAGAIN) ? 0 : 1; | 1853 | return (ret == -EAGAIN) ? 0 : 1; |
@@ -2363,7 +2363,7 @@ static void il_beacon_update(struct ieee80211_hw *hw, | |||
2363 | lockdep_assert_held(&il->mutex); | 2363 | lockdep_assert_held(&il->mutex); |
2364 | 2364 | ||
2365 | if (!il->beacon_ctx) { | 2365 | if (!il->beacon_ctx) { |
2366 | IL_ERR(il, "update beacon but no beacon context!\n"); | 2366 | IL_ERR("update beacon but no beacon context!\n"); |
2367 | dev_kfree_skb(skb); | 2367 | dev_kfree_skb(skb); |
2368 | return; | 2368 | return; |
2369 | } | 2369 | } |
@@ -2440,7 +2440,7 @@ void il_mac_bss_info_changed(struct ieee80211_hw *hw, | |||
2440 | * below/in post_associate will fail. | 2440 | * below/in post_associate will fail. |
2441 | */ | 2441 | */ |
2442 | if (il_scan_cancel_timeout(il, 100)) { | 2442 | if (il_scan_cancel_timeout(il, 100)) { |
2443 | IL_WARN(il, | 2443 | IL_WARN( |
2444 | "Aborted scan still in progress after 100ms\n"); | 2444 | "Aborted scan still in progress after 100ms\n"); |
2445 | D_MAC80211( | 2445 | D_MAC80211( |
2446 | "leaving - scan abort failed.\n"); | 2446 | "leaving - scan abort failed.\n"); |
@@ -2554,7 +2554,7 @@ void il_mac_bss_info_changed(struct ieee80211_hw *hw, | |||
2554 | ret = il->cfg->ops->legacy->manage_ibss_station(il, vif, | 2554 | ret = il->cfg->ops->legacy->manage_ibss_station(il, vif, |
2555 | bss_conf->ibss_joined); | 2555 | bss_conf->ibss_joined); |
2556 | if (ret) | 2556 | if (ret) |
2557 | IL_ERR(il, "failed to %s IBSS station %pM\n", | 2557 | IL_ERR("failed to %s IBSS station %pM\n", |
2558 | bss_conf->ibss_joined ? "add" : "remove", | 2558 | bss_conf->ibss_joined ? "add" : "remove", |
2559 | bss_conf->bssid); | 2559 | bss_conf->bssid); |
2560 | } | 2560 | } |
@@ -2599,7 +2599,7 @@ irqreturn_t il_isr(int irq, void *data) | |||
2599 | if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { | 2599 | if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { |
2600 | /* Hardware disappeared. It might have already raised | 2600 | /* Hardware disappeared. It might have already raised |
2601 | * an interrupt */ | 2601 | * an interrupt */ |
2602 | IL_WARN(il, "HARDWARE GONE?? INTA == 0x%08x\n", inta); | 2602 | IL_WARN("HARDWARE GONE?? INTA == 0x%08x\n", inta); |
2603 | goto unplugged; | 2603 | goto unplugged; |
2604 | } | 2604 | } |
2605 | 2605 | ||