aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-18 16:07:57 -0400
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 05:21:47 -0500
commit9406f79775a5374b932ac45ae9e84a71032a9d33 (patch)
treef832668c069682fb7d55c0b514aff97fe0e03b11 /drivers
parent58de00a464f1e7cf0b108341dc6cc49276d19d7a (diff)
iwlegacy: remove il argument from IWL_ERR/INFO/WARN/CRIT
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c6
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-3945.c48
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c6
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-lib.c16
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-rs.c22
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-sta.c22
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-tx.c32
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965-ucode.c4
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965.c50
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-core.c64
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-debug.h8
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-debugfs.c24
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-eeprom.c10
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-hcmd.c14
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-io.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-led.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-power.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-scan.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-sta.c26
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-tx.c12
-rw-r--r--drivers/net/wireless/iwlegacy/iwl3945-base.c130
-rw-r--r--drivers/net/wireless/iwlegacy/iwl4965-base.c132
23 files changed, 319 insertions, 319 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
index b767979c5dbb..40e3a7065f23 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
@@ -71,7 +71,7 @@ ssize_t il3945_ucode_rx_stats_read(struct file *file,
71 71
72 buf = kzalloc(bufsz, GFP_KERNEL); 72 buf = kzalloc(bufsz, GFP_KERNEL);
73 if (!buf) { 73 if (!buf) {
74 IL_ERR(il, "Can not allocate Buffer\n"); 74 IL_ERR("Can not allocate Buffer\n");
75 return -ENOMEM; 75 return -ENOMEM;
76 } 76 }
77 77
@@ -341,7 +341,7 @@ ssize_t il3945_ucode_tx_stats_read(struct file *file,
341 341
342 buf = kzalloc(bufsz, GFP_KERNEL); 342 buf = kzalloc(bufsz, GFP_KERNEL);
343 if (!buf) { 343 if (!buf) {
344 IL_ERR(il, "Can not allocate Buffer\n"); 344 IL_ERR("Can not allocate Buffer\n");
345 return -ENOMEM; 345 return -ENOMEM;
346 } 346 }
347 347
@@ -440,7 +440,7 @@ ssize_t il3945_ucode_general_stats_read(struct file *file,
440 440
441 buf = kzalloc(bufsz, GFP_KERNEL); 441 buf = kzalloc(bufsz, GFP_KERNEL);
442 if (!buf) { 442 if (!buf) {
443 IL_ERR(il, "Can not allocate Buffer\n"); 443 IL_ERR("Can not allocate Buffer\n");
444 return -ENOMEM; 444 return -ENOMEM;
445 } 445 }
446 446
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c
index a1e2a4218968..cf47fdb28aa1 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.c
@@ -166,7 +166,7 @@ void il3945_disable_events(struct il_priv *il)
166 166
167 base = le32_to_cpu(il->card_alive.log_event_table_ptr); 167 base = le32_to_cpu(il->card_alive.log_event_table_ptr);
168 if (!il3945_hw_valid_rtc_data_addr(base)) { 168 if (!il3945_hw_valid_rtc_data_addr(base)) {
169 IL_ERR(il, "Invalid event log pointer 0x%08X\n", base); 169 IL_ERR("Invalid event log pointer 0x%08X\n", base);
170 return; 170 return;
171 } 171 }
172 172
@@ -317,7 +317,7 @@ static void il3945_rx_reply_tx(struct il_priv *il,
317 int fail; 317 int fail;
318 318
319 if ((index >= txq->q.n_bd) || (il_queue_used(&txq->q, index) == 0)) { 319 if ((index >= txq->q.n_bd) || (il_queue_used(&txq->q, index) == 0)) {
320 IL_ERR(il, "Read index for DMA queue txq_id (%d) index %d " 320 IL_ERR("Read index for DMA queue txq_id (%d) index %d "
321 "is out of range [0-%d] %d %d\n", txq_id, 321 "is out of range [0-%d] %d %d\n", txq_id,
322 index, txq->q.n_bd, txq->q.write_ptr, 322 index, txq->q.n_bd, txq->q.write_ptr,
323 txq->q.read_ptr); 323 txq->q.read_ptr);
@@ -350,7 +350,7 @@ static void il3945_rx_reply_tx(struct il_priv *il,
350 il3945_tx_queue_reclaim(il, txq_id, index); 350 il3945_tx_queue_reclaim(il, txq_id, index);
351 351
352 if (status & TX_ABORT_REQUIRED_MSK) 352 if (status & TX_ABORT_REQUIRED_MSK)
353 IL_ERR(il, "TODO: Implement Tx ABORT REQUIRED!!!\n"); 353 IL_ERR("TODO: Implement Tx ABORT REQUIRED!!!\n");
354} 354}
355 355
356 356
@@ -484,7 +484,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il,
484 484
485 skb = dev_alloc_skb(128); 485 skb = dev_alloc_skb(128);
486 if (!skb) { 486 if (!skb) {
487 IL_ERR(il, "dev_alloc_skb failed\n"); 487 IL_ERR("dev_alloc_skb failed\n");
488 return; 488 return;
489 } 489 }
490 490
@@ -600,7 +600,7 @@ int il3945_hw_txq_attach_buf_to_tfd(struct il_priv *il,
600 count = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags)); 600 count = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));
601 601
602 if ((count >= NUM_TFD_CHUNKS) || (count < 0)) { 602 if ((count >= NUM_TFD_CHUNKS) || (count < 0)) {
603 IL_ERR(il, "Error can not send more than %d chunks\n", 603 IL_ERR("Error can not send more than %d chunks\n",
604 NUM_TFD_CHUNKS); 604 NUM_TFD_CHUNKS);
605 return -EINVAL; 605 return -EINVAL;
606 } 606 }
@@ -633,7 +633,7 @@ void il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)
633 /* sanity check */ 633 /* sanity check */
634 counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags)); 634 counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));
635 if (counter > NUM_TFD_CHUNKS) { 635 if (counter > NUM_TFD_CHUNKS) {
636 IL_ERR(il, "Too many chunks: %i\n", counter); 636 IL_ERR("Too many chunks: %i\n", counter);
637 /* @todo issue fatal error, it is quite serious situation */ 637 /* @todo issue fatal error, it is quite serious situation */
638 return; 638 return;
639 } 639 }
@@ -855,7 +855,7 @@ static int il3945_txq_ctx_reset(struct il_priv *il)
855 rc = il_tx_queue_init(il, &il->txq[txq_id], 855 rc = il_tx_queue_init(il, &il->txq[txq_id],
856 slots_num, txq_id); 856 slots_num, txq_id);
857 if (rc) { 857 if (rc) {
858 IL_ERR(il, "Tx %d queue init failed\n", txq_id); 858 IL_ERR("Tx %d queue init failed\n", txq_id);
859 goto error; 859 goto error;
860 } 860 }
861 } 861 }
@@ -971,7 +971,7 @@ int il3945_hw_nic_init(struct il_priv *il)
971 if (!rxq->bd) { 971 if (!rxq->bd) {
972 rc = il_rx_queue_alloc(il); 972 rc = il_rx_queue_alloc(il);
973 if (rc) { 973 if (rc) {
974 IL_ERR(il, "Unable to initialize Rx queue\n"); 974 IL_ERR("Unable to initialize Rx queue\n");
975 return -ENOMEM; 975 return -ENOMEM;
976 } 976 }
977 } else 977 } else
@@ -1078,7 +1078,7 @@ static int il3945_hw_reg_txpower_get_temperature(struct il_priv *il)
1078 1078
1079 /* handle insane temp reading */ 1079 /* handle insane temp reading */
1080 if (il3945_hw_reg_temp_out_of_range(temperature)) { 1080 if (il3945_hw_reg_temp_out_of_range(temperature)) {
1081 IL_ERR(il, "Error bad temperature value %d\n", temperature); 1081 IL_ERR("Error bad temperature value %d\n", temperature);
1082 1082
1083 /* if really really hot(?), 1083 /* if really really hot(?),
1084 * substitute the 3rd band/group's temp measured at factory */ 1084 * substitute the 3rd band/group's temp measured at factory */
@@ -1388,7 +1388,7 @@ static int il3945_send_tx_power(struct il_priv *il)
1388 txpower.band = (il->band == IEEE80211_BAND_5GHZ) ? 0 : 1; 1388 txpower.band = (il->band == IEEE80211_BAND_5GHZ) ? 0 : 1;
1389 ch_info = il_get_channel_info(il, il->band, chan); 1389 ch_info = il_get_channel_info(il, il->band, chan);
1390 if (!ch_info) { 1390 if (!ch_info) {
1391 IL_ERR(il, 1391 IL_ERR(
1392 "Failed to get channel info for channel %d [%d]\n", 1392 "Failed to get channel info for channel %d [%d]\n",
1393 chan, il->band); 1393 chan, il->band);
1394 return -EINVAL; 1394 return -EINVAL;
@@ -1686,7 +1686,7 @@ static int il3945_send_rxon_assoc(struct il_priv *il,
1686 1686
1687 pkt = (struct il_rx_packet *)cmd.reply_page; 1687 pkt = (struct il_rx_packet *)cmd.reply_page;
1688 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 1688 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
1689 IL_ERR(il, "Bad return from REPLY_RXON_ASSOC command\n"); 1689 IL_ERR("Bad return from REPLY_RXON_ASSOC command\n");
1690 rc = -EIO; 1690 rc = -EIO;
1691 } 1691 }
1692 1692
@@ -1727,7 +1727,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1727 1727
1728 rc = il_check_rxon_cmd(il, ctx); 1728 rc = il_check_rxon_cmd(il, ctx);
1729 if (rc) { 1729 if (rc) {
1730 IL_ERR(il, "Invalid RXON configuration. Not committing.\n"); 1730 IL_ERR("Invalid RXON configuration. Not committing.\n");
1731 return -EINVAL; 1731 return -EINVAL;
1732 } 1732 }
1733 1733
@@ -1739,7 +1739,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1739 rc = il_send_rxon_assoc(il, 1739 rc = il_send_rxon_assoc(il,
1740 &il->contexts[IL_RXON_CTX_BSS]); 1740 &il->contexts[IL_RXON_CTX_BSS]);
1741 if (rc) { 1741 if (rc) {
1742 IL_ERR(il, "Error setting RXON_ASSOC " 1742 IL_ERR("Error setting RXON_ASSOC "
1743 "configuration (%d).\n", rc); 1743 "configuration (%d).\n", rc);
1744 return rc; 1744 return rc;
1745 } 1745 }
@@ -1775,7 +1775,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1775 * active_rxon back to what it was previously */ 1775 * active_rxon back to what it was previously */
1776 if (rc) { 1776 if (rc) {
1777 active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK; 1777 active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
1778 IL_ERR(il, "Error clearing ASSOC_MSK on current " 1778 IL_ERR("Error clearing ASSOC_MSK on current "
1779 "configuration (%d).\n", rc); 1779 "configuration (%d).\n", rc);
1780 return rc; 1780 return rc;
1781 } 1781 }
@@ -1807,7 +1807,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1807 sizeof(struct il3945_rxon_cmd), 1807 sizeof(struct il3945_rxon_cmd),
1808 staging_rxon); 1808 staging_rxon);
1809 if (rc) { 1809 if (rc) {
1810 IL_ERR(il, "Error setting new configuration (%d).\n", rc); 1810 IL_ERR("Error setting new configuration (%d).\n", rc);
1811 return rc; 1811 return rc;
1812 } 1812 }
1813 1813
@@ -1824,14 +1824,14 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1824 * send a new TXPOWER command or we won't be able to Tx any frames */ 1824 * send a new TXPOWER command or we won't be able to Tx any frames */
1825 rc = il_set_tx_power(il, il->tx_power_next, true); 1825 rc = il_set_tx_power(il, il->tx_power_next, true);
1826 if (rc) { 1826 if (rc) {
1827 IL_ERR(il, "Error setting Tx power (%d).\n", rc); 1827 IL_ERR("Error setting Tx power (%d).\n", rc);
1828 return rc; 1828 return rc;
1829 } 1829 }
1830 1830
1831 /* Init the hardware's rate fallback order based on the band */ 1831 /* Init the hardware's rate fallback order based on the band */
1832 rc = il3945_init_hw_rate_table(il); 1832 rc = il3945_init_hw_rate_table(il);
1833 if (rc) { 1833 if (rc) {
1834 IL_ERR(il, "Error setting HW rate table: %02X\n", rc); 1834 IL_ERR("Error setting HW rate table: %02X\n", rc);
1835 return -EIO; 1835 return -EIO;
1836 } 1836 }
1837 1837
@@ -1989,7 +1989,7 @@ static void il3945_hw_reg_init_channel_groups(struct il_priv *il)
1989 1989
1990 /* sanity check on factory saturation power value */ 1990 /* sanity check on factory saturation power value */
1991 if (group->saturation_power < 40) { 1991 if (group->saturation_power < 40) {
1992 IL_WARN(il, "Error: saturation power is %d, " 1992 IL_WARN("Error: saturation power is %d, "
1993 "less than minimum expected 40\n", 1993 "less than minimum expected 40\n",
1994 group->saturation_power); 1994 group->saturation_power);
1995 return; 1995 return;
@@ -2119,7 +2119,7 @@ int il3945_txpower_set_from_eeprom(struct il_priv *il)
2119 ch_info->group_index, 2119 ch_info->group_index,
2120 &power_idx); 2120 &power_idx);
2121 if (rc) { 2121 if (rc) {
2122 IL_ERR(il, "Invalid power index\n"); 2122 IL_ERR("Invalid power index\n");
2123 return rc; 2123 return rc;
2124 } 2124 }
2125 pwr_info->base_power_index = (u8) power_idx; 2125 pwr_info->base_power_index = (u8) power_idx;
@@ -2187,7 +2187,7 @@ int il3945_hw_rxq_stop(struct il_priv *il)
2187 rc = il_poll_direct_bit(il, FH39_RSSR_STATUS, 2187 rc = il_poll_direct_bit(il, FH39_RSSR_STATUS,
2188 FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000); 2188 FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
2189 if (rc < 0) 2189 if (rc < 0)
2190 IL_ERR(il, "Can't stop Rx DMA.\n"); 2190 IL_ERR("Can't stop Rx DMA.\n");
2191 2191
2192 return 0; 2192 return 0;
2193} 2193}
@@ -2263,7 +2263,7 @@ static int il3945_add_bssid_station(struct il_priv *il,
2263 2263
2264 ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id); 2264 ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id);
2265 if (ret) { 2265 if (ret) {
2266 IL_ERR(il, "Unable to add station %pM\n", addr); 2266 IL_ERR("Unable to add station %pM\n", addr);
2267 return ret; 2267 return ret;
2268 } 2268 }
2269 2269
@@ -2390,7 +2390,7 @@ int il3945_hw_set_hw_params(struct il_priv *il)
2390 sizeof(struct il3945_shared), 2390 sizeof(struct il3945_shared),
2391 &il->_3945.shared_phys, GFP_KERNEL); 2391 &il->_3945.shared_phys, GFP_KERNEL);
2392 if (!il->_3945.shared_virt) { 2392 if (!il->_3945.shared_virt) {
2393 IL_ERR(il, "failed to allocate pci memory\n"); 2393 IL_ERR("failed to allocate pci memory\n");
2394 return -ENOMEM; 2394 return -ENOMEM;
2395 } 2395 }
2396 2396
@@ -2481,7 +2481,7 @@ static int il3945_verify_bsm(struct il_priv *il)
2481 reg += sizeof(u32), image++) { 2481 reg += sizeof(u32), image++) {
2482 val = il_read_prph(il, reg); 2482 val = il_read_prph(il, reg);
2483 if (val != le32_to_cpu(*image)) { 2483 if (val != le32_to_cpu(*image)) {
2484 IL_ERR(il, "BSM uCode verification failed at " 2484 IL_ERR("BSM uCode verification failed at "
2485 "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n", 2485 "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
2486 BSM_SRAM_LOWER_BOUND, 2486 BSM_SRAM_LOWER_BOUND,
2487 reg - BSM_SRAM_LOWER_BOUND, len, 2487 reg - BSM_SRAM_LOWER_BOUND, len,
@@ -2620,7 +2620,7 @@ static int il3945_load_bsm(struct il_priv *il)
2620 if (i < 100) 2620 if (i < 100)
2621 D_INFO("BSM write complete, poll %d iterations\n", i); 2621 D_INFO("BSM write complete, poll %d iterations\n", i);
2622 else { 2622 else {
2623 IL_ERR(il, "BSM write did not complete!\n"); 2623 IL_ERR("BSM write did not complete!\n");
2624 return -EIO; 2624 return -EIO;
2625 } 2625 }
2626 2626
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
index 8ea0ac205f7f..ebb71a685101 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
@@ -75,7 +75,7 @@ ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
75 75
76 buf = kzalloc(bufsz, GFP_KERNEL); 76 buf = kzalloc(bufsz, GFP_KERNEL);
77 if (!buf) { 77 if (!buf) {
78 IL_ERR(il, "Can not allocate Buffer\n"); 78 IL_ERR("Can not allocate Buffer\n");
79 return -ENOMEM; 79 return -ENOMEM;
80 } 80 }
81 81
@@ -501,7 +501,7 @@ ssize_t il4965_ucode_tx_stats_read(struct file *file,
501 501
502 buf = kzalloc(bufsz, GFP_KERNEL); 502 buf = kzalloc(bufsz, GFP_KERNEL);
503 if (!buf) { 503 if (!buf) {
504 IL_ERR(il, "Can not allocate Buffer\n"); 504 IL_ERR("Can not allocate Buffer\n");
505 return -ENOMEM; 505 return -ENOMEM;
506 } 506 }
507 507
@@ -679,7 +679,7 @@ il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
679 679
680 buf = kzalloc(bufsz, GFP_KERNEL); 680 buf = kzalloc(bufsz, GFP_KERNEL);
681 if (!buf) { 681 if (!buf) {
682 IL_ERR(il, "Can not allocate Buffer\n"); 682 IL_ERR("Can not allocate Buffer\n");
683 return -ENOMEM; 683 return -ENOMEM;
684 } 684 }
685 685
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
index ef8b0d5f2e07..016472dadf3a 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
@@ -129,12 +129,12 @@ int il4965_eeprom_check_version(struct il_priv *il)
129 calib_ver < il->cfg->eeprom_calib_ver) 129 calib_ver < il->cfg->eeprom_calib_ver)
130 goto err; 130 goto err;
131 131
132 IL_INFO(il, "device EEPROM VER=0x%x, CALIB=0x%x\n", 132 IL_INFO("device EEPROM VER=0x%x, CALIB=0x%x\n",
133 eeprom_ver, calib_ver); 133 eeprom_ver, calib_ver);
134 134
135 return 0; 135 return 0;
136err: 136err:
137 IL_ERR(il, "Unsupported (too old) EEPROM VER=0x%x < 0x%x " 137 IL_ERR("Unsupported (too old) EEPROM VER=0x%x < 0x%x "
138 "CALIB=0x%x < 0x%x\n", 138 "CALIB=0x%x < 0x%x\n",
139 eeprom_ver, il->cfg->eeprom_ver, 139 eeprom_ver, il->cfg->eeprom_ver,
140 calib_ver, il->cfg->eeprom_calib_ver); 140 calib_ver, il->cfg->eeprom_calib_ver);
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
index b51ae3d63b79..f4df28d5973c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
@@ -44,7 +44,7 @@ void il4965_check_abort_status(struct il_priv *il,
44 u8 frame_count, u32 status) 44 u8 frame_count, u32 status)
45{ 45{
46 if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) { 46 if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) {
47 IL_ERR(il, "Tx flush command to flush out all frames\n"); 47 IL_ERR("Tx flush command to flush out all frames\n");
48 if (!test_bit(STATUS_EXIT_PENDING, &il->status)) 48 if (!test_bit(STATUS_EXIT_PENDING, &il->status))
49 queue_work(il->workqueue, &il->tx_flush); 49 queue_work(il->workqueue, &il->tx_flush);
50 } 50 }
@@ -176,7 +176,7 @@ int il4965_hw_nic_init(struct il_priv *il)
176 if (!rxq->bd) { 176 if (!rxq->bd) {
177 ret = il_rx_queue_alloc(il); 177 ret = il_rx_queue_alloc(il);
178 if (ret) { 178 if (ret) {
179 IL_ERR(il, "Unable to initialize Rx queue\n"); 179 IL_ERR("Unable to initialize Rx queue\n");
180 return -ENOMEM; 180 return -ENOMEM;
181 } 181 }
182 } else 182 } else
@@ -309,7 +309,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority)
309 309
310 if ((rxq->free_count <= RX_LOW_WATERMARK) && 310 if ((rxq->free_count <= RX_LOW_WATERMARK) &&
311 net_ratelimit()) 311 net_ratelimit())
312 IL_CRIT(il, 312 IL_CRIT(
313 "Failed to alloc_pages with %s. " 313 "Failed to alloc_pages with %s. "
314 "Only %u free buffers remaining.\n", 314 "Only %u free buffers remaining.\n",
315 priority == GFP_ATOMIC ? 315 priority == GFP_ATOMIC ?
@@ -549,7 +549,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il,
549 549
550 skb = dev_alloc_skb(128); 550 skb = dev_alloc_skb(128);
551 if (!skb) { 551 if (!skb) {
552 IL_ERR(il, "dev_alloc_skb failed\n"); 552 IL_ERR("dev_alloc_skb failed\n");
553 return; 553 return;
554 } 554 }
555 555
@@ -598,7 +598,7 @@ void il4965_rx_reply_rx(struct il_priv *il,
598 ampdu_status = le32_to_cpu(rx_pkt_status); 598 ampdu_status = le32_to_cpu(rx_pkt_status);
599 } else { 599 } else {
600 if (!il->_4965.last_phy_res_valid) { 600 if (!il->_4965.last_phy_res_valid) {
601 IL_ERR(il, "MPDU frame without cached PHY data\n"); 601 IL_ERR("MPDU frame without cached PHY data\n");
602 return; 602 return;
603 } 603 }
604 phy_res = &il->_4965.last_phy_res; 604 phy_res = &il->_4965.last_phy_res;
@@ -880,7 +880,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
880 rate = IL_RATE_6M_PLCP; 880 rate = IL_RATE_6M_PLCP;
881 break; 881 break;
882 default: 882 default:
883 IL_WARN(il, "Invalid scan band\n"); 883 IL_WARN("Invalid scan band\n");
884 return -EIO; 884 return -EIO;
885 } 885 }
886 886
@@ -1184,9 +1184,9 @@ int il4965_dump_fh(struct il_priv *il, char **buf, bool display)
1184 return pos; 1184 return pos;
1185 } 1185 }
1186#endif 1186#endif
1187 IL_ERR(il, "FH register values:\n"); 1187 IL_ERR("FH register values:\n");
1188 for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) { 1188 for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) {
1189 IL_ERR(il, " %34s: 0X%08x\n", 1189 IL_ERR(" %34s: 0X%08x\n",
1190 il4965_get_fh_string(fh_tbl[i]), 1190 il4965_get_fh_string(fh_tbl[i]),
1191 il_read_direct32(il, fh_tbl[i])); 1191 il_read_direct32(il, fh_tbl[i]));
1192 } 1192 }
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
index b53cf1b70c30..93bb31d628b6 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
@@ -367,12 +367,12 @@ static int il4965_rs_tl_turn_on_agg_for_tid(struct il_priv *il,
367 * this might be cause by reloading firmware 367 * this might be cause by reloading firmware
368 * stop the tx ba session here 368 * stop the tx ba session here
369 */ 369 */
370 IL_ERR(il, "Fail start Tx agg on tid: %d\n", 370 IL_ERR("Fail start Tx agg on tid: %d\n",
371 tid); 371 tid);
372 ieee80211_stop_tx_ba_session(sta, tid); 372 ieee80211_stop_tx_ba_session(sta, tid);
373 } 373 }
374 } else { 374 } else {
375 IL_ERR(il, "Aggregation not enabled for tid %d " 375 IL_ERR("Aggregation not enabled for tid %d "
376 "because load = %u\n", tid, load); 376 "because load = %u\n", tid, load);
377 } 377 }
378 return ret; 378 return ret;
@@ -385,7 +385,7 @@ static void il4965_rs_tl_turn_on_agg(struct il_priv *il, u8 tid,
385 if (tid < TID_MAX_LOAD_COUNT) 385 if (tid < TID_MAX_LOAD_COUNT)
386 il4965_rs_tl_turn_on_agg_for_tid(il, lq_data, tid, sta); 386 il4965_rs_tl_turn_on_agg_for_tid(il, lq_data, tid, sta);
387 else 387 else
388 IL_ERR(il, "tid exceeds max load count: %d/%d\n", 388 IL_ERR("tid exceeds max load count: %d/%d\n",
389 tid, TID_MAX_LOAD_COUNT); 389 tid, TID_MAX_LOAD_COUNT);
390} 390}
391 391
@@ -505,7 +505,7 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il,
505 505
506 } else if (is_Ht(tbl->lq_type)) { 506 } else if (is_Ht(tbl->lq_type)) {
507 if (index > IL_LAST_OFDM_RATE) { 507 if (index > IL_LAST_OFDM_RATE) {
508 IL_ERR(il, "Invalid HT rate index %d\n", index); 508 IL_ERR("Invalid HT rate index %d\n", index);
509 index = IL_LAST_OFDM_RATE; 509 index = IL_LAST_OFDM_RATE;
510 } 510 }
511 rate_n_flags = RATE_MCS_HT_MSK; 511 rate_n_flags = RATE_MCS_HT_MSK;
@@ -515,7 +515,7 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il,
515 else 515 else
516 rate_n_flags |= il_rates[index].plcp_mimo2; 516 rate_n_flags |= il_rates[index].plcp_mimo2;
517 } else { 517 } else {
518 IL_ERR(il, "Invalid tbl->lq_type %d\n", tbl->lq_type); 518 IL_ERR("Invalid tbl->lq_type %d\n", tbl->lq_type);
519 } 519 }
520 520
521 rate_n_flags |= ((tbl->ant_type << RATE_MCS_ANT_POS) & 521 rate_n_flags |= ((tbl->ant_type << RATE_MCS_ANT_POS) &
@@ -535,7 +535,7 @@ static u32 il4965_rate_n_flags_from_tbl(struct il_priv *il,
535 rate_n_flags |= RATE_MCS_GF_MSK; 535 rate_n_flags |= RATE_MCS_GF_MSK;
536 if (is_siso(tbl->lq_type) && tbl->is_SGI) { 536 if (is_siso(tbl->lq_type) && tbl->is_SGI) {
537 rate_n_flags &= ~RATE_MCS_SGI_MSK; 537 rate_n_flags &= ~RATE_MCS_SGI_MSK;
538 IL_ERR(il, "GF was set with SGI:SISO\n"); 538 IL_ERR("GF was set with SGI:SISO\n");
539 } 539 }
540 } 540 }
541 } 541 }
@@ -1480,7 +1480,7 @@ static int il4965_rs_move_siso_to_other(struct il_priv *il,
1480 if (!tbl->is_SGI) 1480 if (!tbl->is_SGI)
1481 break; 1481 break;
1482 else 1482 else
1483 IL_ERR(il, 1483 IL_ERR(
1484 "SGI was set in GF+SISO\n"); 1484 "SGI was set in GF+SISO\n");
1485 } 1485 }
1486 search_tbl->is_SGI = !tbl->is_SGI; 1486 search_tbl->is_SGI = !tbl->is_SGI;
@@ -1851,7 +1851,7 @@ static void il4965_rs_rate_scale_perform(struct il_priv *il,
1851 rate_scale_index_msk = rate_mask; 1851 rate_scale_index_msk = rate_mask;
1852 1852
1853 if (!((1 << index) & rate_scale_index_msk)) { 1853 if (!((1 << index) & rate_scale_index_msk)) {
1854 IL_ERR(il, "Current Rate is not valid\n"); 1854 IL_ERR("Current Rate is not valid\n");
1855 if (lq_sta->search_better_tbl) { 1855 if (lq_sta->search_better_tbl) {
1856 /* revert to active table if search table is not valid*/ 1856 /* revert to active table if search table is not valid*/
1857 tbl->lq_type = LQ_NONE; 1857 tbl->lq_type = LQ_NONE;
@@ -1867,7 +1867,7 @@ static void il4965_rs_rate_scale_perform(struct il_priv *il,
1867 1867
1868 /* Get expected throughput table and history window for current rate */ 1868 /* Get expected throughput table and history window for current rate */
1869 if (!tbl->expected_tpt) { 1869 if (!tbl->expected_tpt) {
1870 IL_ERR(il, "tbl->expected_tpt is NULL\n"); 1870 IL_ERR("tbl->expected_tpt is NULL\n");
1871 return; 1871 return;
1872 } 1872 }
1873 1873
@@ -1909,7 +1909,7 @@ static void il4965_rs_rate_scale_perform(struct il_priv *il,
1909 * actual average throughput */ 1909 * actual average throughput */
1910 if (window->average_tpt != ((window->success_ratio * 1910 if (window->average_tpt != ((window->success_ratio *
1911 tbl->expected_tpt[index] + 64) / 128)) { 1911 tbl->expected_tpt[index] + 64) / 128)) {
1912 IL_ERR(il, 1912 IL_ERR(
1913 "expected_tpt should have been calculated by now\n"); 1913 "expected_tpt should have been calculated by now\n");
1914 window->average_tpt = ((window->success_ratio * 1914 window->average_tpt = ((window->success_ratio *
1915 tbl->expected_tpt[index] + 64) / 128); 1915 tbl->expected_tpt[index] + 64) / 128);
@@ -2590,7 +2590,7 @@ static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,
2590 D_RATE("Fixed rate ON\n"); 2590 D_RATE("Fixed rate ON\n");
2591 } else { 2591 } else {
2592 lq_sta->dbg_fixed_rate = 0; 2592 lq_sta->dbg_fixed_rate = 0;
2593 IL_ERR(il, 2593 IL_ERR(
2594 "Invalid antenna selection 0x%X, Valid is 0x%X\n", 2594 "Invalid antenna selection 0x%X, Valid is 0x%X\n",
2595 ant_sel_tx, valid_tx_ant); 2595 ant_sel_tx, valid_tx_ant);
2596 D_RATE("Fixed rate OFF\n"); 2596 D_RATE("Fixed rate OFF\n");
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
index 3019bafc2352..a82d44489a6c 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
@@ -44,7 +44,7 @@ il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id)
44 44
45 link_cmd = kzalloc(sizeof(struct il_link_quality_cmd), GFP_KERNEL); 45 link_cmd = kzalloc(sizeof(struct il_link_quality_cmd), GFP_KERNEL);
46 if (!link_cmd) { 46 if (!link_cmd) {
47 IL_ERR(il, "Unable to allocate memory for LQ cmd.\n"); 47 IL_ERR("Unable to allocate memory for LQ cmd.\n");
48 return NULL; 48 return NULL;
49 } 49 }
50 /* Set up the rate scaling to start at selected rate, fall back 50 /* Set up the rate scaling to start at selected rate, fall back
@@ -105,7 +105,7 @@ il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,
105 105
106 ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id); 106 ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id);
107 if (ret) { 107 if (ret) {
108 IL_ERR(il, "Unable to add station %pM\n", addr); 108 IL_ERR("Unable to add station %pM\n", addr);
109 return ret; 109 return ret;
110 } 110 }
111 111
@@ -119,7 +119,7 @@ il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,
119 /* Set up default rate scaling table in device's station table */ 119 /* Set up default rate scaling table in device's station table */
120 link_cmd = il4965_sta_alloc_lq(il, sta_id); 120 link_cmd = il4965_sta_alloc_lq(il, sta_id);
121 if (!link_cmd) { 121 if (!link_cmd) {
122 IL_ERR(il, 122 IL_ERR(
123 "Unable to initialize rate scaling for station %pM.\n", 123 "Unable to initialize rate scaling for station %pM.\n",
124 addr); 124 addr);
125 return -ENOMEM; 125 return -ENOMEM;
@@ -127,7 +127,7 @@ il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,
127 127
128 ret = il_send_lq_cmd(il, ctx, link_cmd, CMD_SYNC, true); 128 ret = il_send_lq_cmd(il, ctx, link_cmd, CMD_SYNC, true);
129 if (ret) 129 if (ret)
130 IL_ERR(il, "Link quality command failed (%d)\n", ret); 130 IL_ERR("Link quality command failed (%d)\n", ret);
131 131
132 spin_lock_irqsave(&il->sta_lock, flags); 132 spin_lock_irqsave(&il->sta_lock, flags);
133 il->stations[sta_id].lq = link_cmd; 133 il->stations[sta_id].lq = link_cmd;
@@ -467,7 +467,7 @@ int il4965_remove_dynamic_key(struct il_priv *il,
467 } 467 }
468 468
469 if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) { 469 if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
470 IL_WARN(il, "Removing wrong key %d 0x%x\n", 470 IL_WARN("Removing wrong key %d 0x%x\n",
471 keyconf->keyidx, key_flags); 471 keyconf->keyidx, key_flags);
472 spin_unlock_irqrestore(&il->sta_lock, flags); 472 spin_unlock_irqrestore(&il->sta_lock, flags);
473 return 0; 473 return 0;
@@ -475,7 +475,7 @@ int il4965_remove_dynamic_key(struct il_priv *il,
475 475
476 if (!test_and_clear_bit(il->stations[sta_id].sta.key.key_offset, 476 if (!test_and_clear_bit(il->stations[sta_id].sta.key.key_offset,
477 &il->ucode_key_table)) 477 &il->ucode_key_table))
478 IL_ERR(il, "index %d not used in uCode key table.\n", 478 IL_ERR("index %d not used in uCode key table.\n",
479 il->stations[sta_id].sta.key.key_offset); 479 il->stations[sta_id].sta.key.key_offset);
480 memset(&il->stations[sta_id].keyinfo, 0, 480 memset(&il->stations[sta_id].keyinfo, 0,
481 sizeof(struct il_hw_key)); 481 sizeof(struct il_hw_key));
@@ -525,7 +525,7 @@ int il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,
525 keyconf, sta_id); 525 keyconf, sta_id);
526 break; 526 break;
527 default: 527 default:
528 IL_ERR(il, 528 IL_ERR(
529 "Unknown alg: %s cipher = %x\n", __func__, 529 "Unknown alg: %s cipher = %x\n", __func__,
530 keyconf->cipher); 530 keyconf->cipher);
531 ret = -EINVAL; 531 ret = -EINVAL;
@@ -557,7 +557,7 @@ int il4965_alloc_bcast_station(struct il_priv *il,
557 sta_id = il_prep_station(il, ctx, il_bcast_addr, 557 sta_id = il_prep_station(il, ctx, il_bcast_addr,
558 false, NULL); 558 false, NULL);
559 if (sta_id == IL_INVALID_STATION) { 559 if (sta_id == IL_INVALID_STATION) {
560 IL_ERR(il, "Unable to prepare broadcast station\n"); 560 IL_ERR("Unable to prepare broadcast station\n");
561 spin_unlock_irqrestore(&il->sta_lock, flags); 561 spin_unlock_irqrestore(&il->sta_lock, flags);
562 562
563 return -EINVAL; 563 return -EINVAL;
@@ -569,7 +569,7 @@ int il4965_alloc_bcast_station(struct il_priv *il,
569 569
570 link_cmd = il4965_sta_alloc_lq(il, sta_id); 570 link_cmd = il4965_sta_alloc_lq(il, sta_id);
571 if (!link_cmd) { 571 if (!link_cmd) {
572 IL_ERR(il, 572 IL_ERR(
573 "Unable to initialize rate scaling for bcast station.\n"); 573 "Unable to initialize rate scaling for bcast station.\n");
574 return -ENOMEM; 574 return -ENOMEM;
575 } 575 }
@@ -596,7 +596,7 @@ static int il4965_update_bcast_station(struct il_priv *il,
596 596
597 link_cmd = il4965_sta_alloc_lq(il, sta_id); 597 link_cmd = il4965_sta_alloc_lq(il, sta_id);
598 if (!link_cmd) { 598 if (!link_cmd) {
599 IL_ERR(il, 599 IL_ERR(
600 "Unable to initialize rate scaling for bcast station.\n"); 600 "Unable to initialize rate scaling for bcast station.\n");
601 return -ENOMEM; 601 return -ENOMEM;
602 } 602 }
@@ -686,7 +686,7 @@ int il4965_sta_rx_agg_stop(struct il_priv *il, struct ieee80211_sta *sta,
686 686
687 sta_id = il_sta_id(sta); 687 sta_id = il_sta_id(sta);
688 if (sta_id == IL_INVALID_STATION) { 688 if (sta_id == IL_INVALID_STATION) {
689 IL_ERR(il, "Invalid station for AGG tid %d\n", tid); 689 IL_ERR("Invalid station for AGG tid %d\n", tid);
690 return -ENXIO; 690 return -ENXIO;
691 } 691 }
692 692
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
index efc21be8a940..66dd172fed60 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
@@ -258,7 +258,7 @@ static void il4965_tx_cmd_build_hwcrypto(struct il_priv *il,
258 break; 258 break;
259 259
260 default: 260 default:
261 IL_ERR(il, "Unknown encode cipher %x\n", keyconf->cipher); 261 IL_ERR("Unknown encode cipher %x\n", keyconf->cipher);
262 break; 262 break;
263 } 263 }
264} 264}
@@ -619,13 +619,13 @@ int il4965_txq_ctx_alloc(struct il_priv *il)
619 ret = il4965_alloc_dma_ptr(il, &il->scd_bc_tbls, 619 ret = il4965_alloc_dma_ptr(il, &il->scd_bc_tbls,
620 il->hw_params.scd_bc_tbls_size); 620 il->hw_params.scd_bc_tbls_size);
621 if (ret) { 621 if (ret) {
622 IL_ERR(il, "Scheduler BC Table allocation failed\n"); 622 IL_ERR("Scheduler BC Table allocation failed\n");
623 goto error_bc_tbls; 623 goto error_bc_tbls;
624 } 624 }
625 /* Alloc keep-warm buffer */ 625 /* Alloc keep-warm buffer */
626 ret = il4965_alloc_dma_ptr(il, &il->kw, IL_KW_SIZE); 626 ret = il4965_alloc_dma_ptr(il, &il->kw, IL_KW_SIZE);
627 if (ret) { 627 if (ret) {
628 IL_ERR(il, "Keep Warm allocation failed\n"); 628 IL_ERR("Keep Warm allocation failed\n");
629 goto error_kw; 629 goto error_kw;
630 } 630 }
631 631
@@ -652,7 +652,7 @@ int il4965_txq_ctx_alloc(struct il_priv *il)
652 &il->txq[txq_id], slots_num, 652 &il->txq[txq_id], slots_num,
653 txq_id); 653 txq_id);
654 if (ret) { 654 if (ret) {
655 IL_ERR(il, "Tx %d queue init failed\n", txq_id); 655 IL_ERR("Tx %d queue init failed\n", txq_id);
656 goto error; 656 goto error;
657 } 657 }
658 } 658 }
@@ -712,7 +712,7 @@ void il4965_txq_ctx_stop(struct il_priv *il)
712 if (il_poll_direct_bit(il, FH_TSSR_TX_STATUS_REG, 712 if (il_poll_direct_bit(il, FH_TSSR_TX_STATUS_REG,
713 FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 713 FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
714 1000)) 714 1000))
715 IL_ERR(il, "Failing on timeout while stopping" 715 IL_ERR("Failing on timeout while stopping"
716 " DMA channel %d [0x%08x]", ch, 716 " DMA channel %d [0x%08x]", ch,
717 il_read_direct32(il, 717 il_read_direct32(il,
718 FH_TSSR_TX_STATUS_REG)); 718 FH_TSSR_TX_STATUS_REG));
@@ -803,7 +803,7 @@ static int il4965_txq_agg_enable(struct il_priv *il, int txq_id,
803 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) || 803 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
804 (IWL49_FIRST_AMPDU_QUEUE + 804 (IWL49_FIRST_AMPDU_QUEUE +
805 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) { 805 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
806 IL_WARN(il, 806 IL_WARN(
807 "queue number out of range: %d, must be %d to %d\n", 807 "queue number out of range: %d, must be %d to %d\n",
808 txq_id, IWL49_FIRST_AMPDU_QUEUE, 808 txq_id, IWL49_FIRST_AMPDU_QUEUE,
809 IWL49_FIRST_AMPDU_QUEUE + 809 IWL49_FIRST_AMPDU_QUEUE +
@@ -871,25 +871,25 @@ int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,
871 if (unlikely(tx_fifo < 0)) 871 if (unlikely(tx_fifo < 0))
872 return tx_fifo; 872 return tx_fifo;
873 873
874 IL_WARN(il, "%s on ra = %pM tid = %d\n", 874 IL_WARN("%s on ra = %pM tid = %d\n",
875 __func__, sta->addr, tid); 875 __func__, sta->addr, tid);
876 876
877 sta_id = il_sta_id(sta); 877 sta_id = il_sta_id(sta);
878 if (sta_id == IL_INVALID_STATION) { 878 if (sta_id == IL_INVALID_STATION) {
879 IL_ERR(il, "Start AGG on invalid station\n"); 879 IL_ERR("Start AGG on invalid station\n");
880 return -ENXIO; 880 return -ENXIO;
881 } 881 }
882 if (unlikely(tid >= MAX_TID_COUNT)) 882 if (unlikely(tid >= MAX_TID_COUNT))
883 return -EINVAL; 883 return -EINVAL;
884 884
885 if (il->stations[sta_id].tid[tid].agg.state != IL_AGG_OFF) { 885 if (il->stations[sta_id].tid[tid].agg.state != IL_AGG_OFF) {
886 IL_ERR(il, "Start AGG when state is not IL_AGG_OFF !\n"); 886 IL_ERR("Start AGG when state is not IL_AGG_OFF !\n");
887 return -ENXIO; 887 return -ENXIO;
888 } 888 }
889 889
890 txq_id = il4965_txq_ctx_activate_free(il); 890 txq_id = il4965_txq_ctx_activate_free(il);
891 if (txq_id == -1) { 891 if (txq_id == -1) {
892 IL_ERR(il, "No free aggregation queue available\n"); 892 IL_ERR("No free aggregation queue available\n");
893 return -ENXIO; 893 return -ENXIO;
894 } 894 }
895 895
@@ -932,7 +932,7 @@ static int il4965_txq_agg_disable(struct il_priv *il, u16 txq_id,
932 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) || 932 if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
933 (IWL49_FIRST_AMPDU_QUEUE + 933 (IWL49_FIRST_AMPDU_QUEUE +
934 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) { 934 il->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
935 IL_WARN(il, 935 IL_WARN(
936 "queue number out of range: %d, must be %d to %d\n", 936 "queue number out of range: %d, must be %d to %d\n",
937 txq_id, IWL49_FIRST_AMPDU_QUEUE, 937 txq_id, IWL49_FIRST_AMPDU_QUEUE,
938 IWL49_FIRST_AMPDU_QUEUE + 938 IWL49_FIRST_AMPDU_QUEUE +
@@ -973,7 +973,7 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
973 sta_id = il_sta_id(sta); 973 sta_id = il_sta_id(sta);
974 974
975 if (sta_id == IL_INVALID_STATION) { 975 if (sta_id == IL_INVALID_STATION) {
976 IL_ERR(il, "Invalid station for AGG tid %d\n", tid); 976 IL_ERR("Invalid station for AGG tid %d\n", tid);
977 return -ENXIO; 977 return -ENXIO;
978 } 978 }
979 979
@@ -996,7 +996,7 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
996 case IL_AGG_ON: 996 case IL_AGG_ON:
997 break; 997 break;
998 default: 998 default:
999 IL_WARN(il, "Stopping AGG while state not ON or starting\n"); 999 IL_WARN("Stopping AGG while state not ON or starting\n");
1000 } 1000 }
1001 1001
1002 write_ptr = il->txq[txq_id].q.write_ptr; 1002 write_ptr = il->txq[txq_id].q.write_ptr;
@@ -1115,7 +1115,7 @@ int il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int index)
1115 struct ieee80211_hdr *hdr; 1115 struct ieee80211_hdr *hdr;
1116 1116
1117 if ((index >= q->n_bd) || (il_queue_used(q, index) == 0)) { 1117 if ((index >= q->n_bd) || (il_queue_used(q, index) == 0)) {
1118 IL_ERR(il, "Read index for DMA queue txq id (%d), index %d, " 1118 IL_ERR("Read index for DMA queue txq id (%d), index %d, "
1119 "is out of range [0-%d] %d %d.\n", txq_id, 1119 "is out of range [0-%d] %d %d.\n", txq_id,
1120 index, q->n_bd, q->write_ptr, q->read_ptr); 1120 index, q->n_bd, q->write_ptr, q->read_ptr);
1121 return 0; 1121 return 0;
@@ -1163,7 +1163,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il,
1163 1163
1164 if (unlikely(!agg->wait_for_ba)) { 1164 if (unlikely(!agg->wait_for_ba)) {
1165 if (unlikely(ba_resp->bitmap)) 1165 if (unlikely(ba_resp->bitmap))
1166 IL_ERR(il, "Received BA when not expected\n"); 1166 IL_ERR("Received BA when not expected\n");
1167 return -EINVAL; 1167 return -EINVAL;
1168 } 1168 }
1169 1169
@@ -1266,7 +1266,7 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il,
1266 u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); 1266 u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
1267 1267
1268 if (scd_flow >= il->hw_params.max_txq_num) { 1268 if (scd_flow >= il->hw_params.max_txq_num) {
1269 IL_ERR(il, 1269 IL_ERR(
1270 "BUG_ON scd_flow is bigger than number of queues\n"); 1270 "BUG_ON scd_flow is bigger than number of queues\n");
1271 return; 1271 return;
1272 } 1272 }
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c b/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
index d1e1775aa01b..3fa939e490cf 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
@@ -99,7 +99,7 @@ static int il4965_verify_inst_full(struct il_priv *il, __le32 *image,
99 * if IL_DL_IO is set */ 99 * if IL_DL_IO is set */
100 val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT); 100 val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT);
101 if (val != le32_to_cpu(*image)) { 101 if (val != le32_to_cpu(*image)) {
102 IL_ERR(il, "uCode INST section is invalid at " 102 IL_ERR("uCode INST section is invalid at "
103 "offset 0x%x, is 0x%x, s/b 0x%x\n", 103 "offset 0x%x, is 0x%x, s/b 0x%x\n",
104 save_len - len, val, le32_to_cpu(*image)); 104 save_len - len, val, le32_to_cpu(*image));
105 ret = -EIO; 105 ret = -EIO;
@@ -153,7 +153,7 @@ int il4965_verify_ucode(struct il_priv *il)
153 return 0; 153 return 0;
154 } 154 }
155 155
156 IL_ERR(il, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n"); 156 IL_ERR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
157 157
158 /* Since nothing seems to match, show first several data entries in 158 /* Since nothing seems to match, show first several data entries in
159 * instruction SRAM, so maybe visual inspection will give a clue. 159 * instruction SRAM, so maybe visual inspection will give a clue.
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c
index cc28e0e084e4..7b422f2346ae 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.c
@@ -78,7 +78,7 @@ static int il4965_verify_bsm(struct il_priv *il)
78 reg += sizeof(u32), image++) { 78 reg += sizeof(u32), image++) {
79 val = il_read_prph(il, reg); 79 val = il_read_prph(il, reg);
80 if (val != le32_to_cpu(*image)) { 80 if (val != le32_to_cpu(*image)) {
81 IL_ERR(il, "BSM uCode verification failed at " 81 IL_ERR("BSM uCode verification failed at "
82 "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n", 82 "addr 0x%08X+%u (of %u), is 0x%x, s/b 0x%x\n",
83 BSM_SRAM_LOWER_BOUND, 83 BSM_SRAM_LOWER_BOUND,
84 reg - BSM_SRAM_LOWER_BOUND, len, 84 reg - BSM_SRAM_LOWER_BOUND, len,
@@ -191,7 +191,7 @@ static int il4965_load_bsm(struct il_priv *il)
191 if (i < 100) 191 if (i < 100)
192 D_INFO("BSM write complete, poll %d iterations\n", i); 192 D_INFO("BSM write complete, poll %d iterations\n", i);
193 else { 193 else {
194 IL_ERR(il, "BSM write did not complete!\n"); 194 IL_ERR("BSM write did not complete!\n");
195 return -EIO; 195 return -EIO;
196 } 196 }
197 197
@@ -343,7 +343,7 @@ static void il4965_chain_noise_reset(struct il_priv *il)
343 cmd.diff_gain_c = 0; 343 cmd.diff_gain_c = 0;
344 if (il_send_cmd_pdu(il, REPLY_PHY_CALIBRATION_CMD, 344 if (il_send_cmd_pdu(il, REPLY_PHY_CALIBRATION_CMD,
345 sizeof(cmd), &cmd)) 345 sizeof(cmd), &cmd))
346 IL_ERR(il, 346 IL_ERR(
347 "Could not send REPLY_PHY_CALIBRATION_CMD\n"); 347 "Could not send REPLY_PHY_CALIBRATION_CMD\n");
348 data->state = IL_CHAIN_NOISE_ACCUMULATE; 348 data->state = IL_CHAIN_NOISE_ACCUMULATE;
349 D_CALIB("Run chain_noise_calibrate\n"); 349 D_CALIB("Run chain_noise_calibrate\n");
@@ -548,7 +548,7 @@ static int il4965_interpolate_chan(struct il_priv *il, u32 channel,
548 548
549 s = il4965_get_sub_band(il, channel); 549 s = il4965_get_sub_band(il, channel);
550 if (s >= EEPROM_TX_POWER_BANDS) { 550 if (s >= EEPROM_TX_POWER_BANDS) {
551 IL_ERR(il, "Tx Power can not find channel %d\n", channel); 551 IL_ERR("Tx Power can not find channel %d\n", channel);
552 return -1; 552 return -1;
553 } 553 }
554 554
@@ -912,7 +912,7 @@ static int il4965_fill_txpower_tbl(struct il_priv *il, u8 band, u16 channel,
912 * and 2) mimo txpower balance between Tx chains. */ 912 * and 2) mimo txpower balance between Tx chains. */
913 txatten_grp = il4965_get_tx_atten_grp(channel); 913 txatten_grp = il4965_get_tx_atten_grp(channel);
914 if (txatten_grp < 0) { 914 if (txatten_grp < 0) {
915 IL_ERR(il, "Can't find txatten group for channel %d.\n", 915 IL_ERR("Can't find txatten group for channel %d.\n",
916 channel); 916 channel);
917 return txatten_grp; 917 return txatten_grp;
918 } 918 }
@@ -1078,12 +1078,12 @@ static int il4965_fill_txpower_tbl(struct il_priv *il, u8 band, u16 channel,
1078 1078
1079 /* stay within the table! */ 1079 /* stay within the table! */
1080 if (power_index > 107) { 1080 if (power_index > 107) {
1081 IL_WARN(il, "txpower index %d > 107\n", 1081 IL_WARN("txpower index %d > 107\n",
1082 power_index); 1082 power_index);
1083 power_index = 107; 1083 power_index = 107;
1084 } 1084 }
1085 if (power_index < 0) { 1085 if (power_index < 0) {
1086 IL_WARN(il, "txpower index %d < 0\n", 1086 IL_WARN("txpower index %d < 0\n",
1087 power_index); 1087 power_index);
1088 power_index = 0; 1088 power_index = 0;
1089 } 1089 }
@@ -1207,7 +1207,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1207 1207
1208 ret = il_check_rxon_cmd(il, ctx); 1208 ret = il_check_rxon_cmd(il, ctx);
1209 if (ret) { 1209 if (ret) {
1210 IL_ERR(il, "Invalid RXON configuration. Not committing.\n"); 1210 IL_ERR("Invalid RXON configuration. Not committing.\n");
1211 return -EINVAL; 1211 return -EINVAL;
1212 } 1212 }
1213 1213
@@ -1228,7 +1228,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1228 if (!il_full_rxon_required(il, ctx)) { 1228 if (!il_full_rxon_required(il, ctx)) {
1229 ret = il_send_rxon_assoc(il, ctx); 1229 ret = il_send_rxon_assoc(il, ctx);
1230 if (ret) { 1230 if (ret) {
1231 IL_ERR(il, "Error setting RXON_ASSOC (%d)\n", ret); 1231 IL_ERR("Error setting RXON_ASSOC (%d)\n", ret);
1232 return ret; 1232 return ret;
1233 } 1233 }
1234 1234
@@ -1258,14 +1258,14 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1258 * active_rxon back to what it was previously */ 1258 * active_rxon back to what it was previously */
1259 if (ret) { 1259 if (ret) {
1260 active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK; 1260 active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
1261 IL_ERR(il, "Error clearing ASSOC_MSK (%d)\n", ret); 1261 IL_ERR("Error clearing ASSOC_MSK (%d)\n", ret);
1262 return ret; 1262 return ret;
1263 } 1263 }
1264 il_clear_ucode_stations(il, ctx); 1264 il_clear_ucode_stations(il, ctx);
1265 il_restore_stations(il, ctx); 1265 il_restore_stations(il, ctx);
1266 ret = il4965_restore_default_wep_keys(il, ctx); 1266 ret = il4965_restore_default_wep_keys(il, ctx);
1267 if (ret) { 1267 if (ret) {
1268 IL_ERR(il, "Failed to restore WEP keys (%d)\n", ret); 1268 IL_ERR("Failed to restore WEP keys (%d)\n", ret);
1269 return ret; 1269 return ret;
1270 } 1270 }
1271 } 1271 }
@@ -1289,7 +1289,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1289 ret = il_send_cmd_pdu(il, ctx->rxon_cmd, 1289 ret = il_send_cmd_pdu(il, ctx->rxon_cmd,
1290 sizeof(struct il_rxon_cmd), &ctx->staging); 1290 sizeof(struct il_rxon_cmd), &ctx->staging);
1291 if (ret) { 1291 if (ret) {
1292 IL_ERR(il, "Error setting new RXON (%d)\n", ret); 1292 IL_ERR("Error setting new RXON (%d)\n", ret);
1293 return ret; 1293 return ret;
1294 } 1294 }
1295 D_INFO("Return from !new_assoc RXON.\n"); 1295 D_INFO("Return from !new_assoc RXON.\n");
@@ -1298,7 +1298,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1298 il_restore_stations(il, ctx); 1298 il_restore_stations(il, ctx);
1299 ret = il4965_restore_default_wep_keys(il, ctx); 1299 ret = il4965_restore_default_wep_keys(il, ctx);
1300 if (ret) { 1300 if (ret) {
1301 IL_ERR(il, "Failed to restore WEP keys (%d)\n", ret); 1301 IL_ERR("Failed to restore WEP keys (%d)\n", ret);
1302 return ret; 1302 return ret;
1303 } 1303 }
1304 } 1304 }
@@ -1310,7 +1310,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1310 ret = il_send_cmd_pdu(il, ctx->rxon_cmd, 1310 ret = il_send_cmd_pdu(il, ctx->rxon_cmd,
1311 sizeof(struct il_rxon_cmd), &ctx->staging); 1311 sizeof(struct il_rxon_cmd), &ctx->staging);
1312 if (ret) { 1312 if (ret) {
1313 IL_ERR(il, "Error setting new RXON (%d)\n", ret); 1313 IL_ERR("Error setting new RXON (%d)\n", ret);
1314 return ret; 1314 return ret;
1315 } 1315 }
1316 memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon)); 1316 memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
@@ -1323,7 +1323,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1323 * send a new TXPOWER command or we won't be able to Tx any frames */ 1323 * send a new TXPOWER command or we won't be able to Tx any frames */
1324 ret = il_set_tx_power(il, il->tx_power_next, true); 1324 ret = il_set_tx_power(il, il->tx_power_next, true);
1325 if (ret) { 1325 if (ret) {
1326 IL_ERR(il, "Error sending TX power (%d)\n", ret); 1326 IL_ERR("Error sending TX power (%d)\n", ret);
1327 return ret; 1327 return ret;
1328 } 1328 }
1329 1329
@@ -1393,7 +1393,7 @@ static int il4965_hw_channel_switch(struct il_priv *il,
1393 if (ch_info) 1393 if (ch_info)
1394 cmd.expect_beacon = il_is_channel_radar(ch_info); 1394 cmd.expect_beacon = il_is_channel_radar(ch_info);
1395 else { 1395 else {
1396 IL_ERR(il, "invalid channel switch from %u to %u\n", 1396 IL_ERR("invalid channel switch from %u to %u\n",
1397 ctx->active.channel, ch); 1397 ctx->active.channel, ch);
1398 return -EFAULT; 1398 return -EFAULT;
1399 } 1399 }
@@ -1479,7 +1479,7 @@ static int il4965_hw_get_temperature(struct il_priv *il)
1479 D_TEMP("Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt); 1479 D_TEMP("Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);
1480 1480
1481 if (R3 == R1) { 1481 if (R3 == R1) {
1482 IL_ERR(il, "Calibration conflict R1 == R3\n"); 1482 IL_ERR("Calibration conflict R1 == R3\n");
1483 return -1; 1483 return -1;
1484 } 1484 }
1485 1485
@@ -1666,7 +1666,7 @@ static int il4965_tx_status_reply_tx(struct il_priv *il,
1666 1666
1667 hdr = il_tx_queue_get_hdr(il, txq_id, idx); 1667 hdr = il_tx_queue_get_hdr(il, txq_id, idx);
1668 if (!hdr) { 1668 if (!hdr) {
1669 IL_ERR(il, 1669 IL_ERR(
1670 "BUG_ON idx doesn't point to valid skb" 1670 "BUG_ON idx doesn't point to valid skb"
1671 " idx=%d, txq_id=%d\n", idx, txq_id); 1671 " idx=%d, txq_id=%d\n", idx, txq_id);
1672 return -1; 1672 return -1;
@@ -1674,7 +1674,7 @@ static int il4965_tx_status_reply_tx(struct il_priv *il,
1674 1674
1675 sc = le16_to_cpu(hdr->seq_ctrl); 1675 sc = le16_to_cpu(hdr->seq_ctrl);
1676 if (idx != (SEQ_TO_SN(sc) & 0xff)) { 1676 if (idx != (SEQ_TO_SN(sc) & 0xff)) {
1677 IL_ERR(il, 1677 IL_ERR(
1678 "BUG_ON idx doesn't match seq control" 1678 "BUG_ON idx doesn't match seq control"
1679 " idx=%d, seq_idx=%d, seq=%d\n", 1679 " idx=%d, seq_idx=%d, seq=%d\n",
1680 idx, SEQ_TO_SN(sc), hdr->seq_ctrl); 1680 idx, SEQ_TO_SN(sc), hdr->seq_ctrl);
@@ -1750,7 +1750,7 @@ static u8 il4965_find_station(struct il_priv *il, const u8 *addr)
1750 (!(il->stations[ret].used & IL_STA_UCODE_ACTIVE) || 1750 (!(il->stations[ret].used & IL_STA_UCODE_ACTIVE) ||
1751 ((il->stations[ret].used & IL_STA_UCODE_ACTIVE) && 1751 ((il->stations[ret].used & IL_STA_UCODE_ACTIVE) &&
1752 (il->stations[ret].used & IL_STA_UCODE_INPROGRESS)))) { 1752 (il->stations[ret].used & IL_STA_UCODE_INPROGRESS)))) {
1753 IL_ERR(il, "Requested station info for sta %d before ready.\n", 1753 IL_ERR("Requested station info for sta %d before ready.\n",
1754 ret); 1754 ret);
1755 ret = IL_INVALID_STATION; 1755 ret = IL_INVALID_STATION;
1756 } 1756 }
@@ -1790,7 +1790,7 @@ static void il4965_rx_reply_tx(struct il_priv *il,
1790 unsigned long flags; 1790 unsigned long flags;
1791 1791
1792 if ((index >= txq->q.n_bd) || (il_queue_used(&txq->q, index) == 0)) { 1792 if ((index >= txq->q.n_bd) || (il_queue_used(&txq->q, index) == 0)) {
1793 IL_ERR(il, "Read index for DMA queue txq_id (%d) index %d " 1793 IL_ERR("Read index for DMA queue txq_id (%d) index %d "
1794 "is out of range [0-%d] %d %d\n", txq_id, 1794 "is out of range [0-%d] %d %d\n", txq_id,
1795 index, txq->q.n_bd, txq->q.write_ptr, 1795 index, txq->q.n_bd, txq->q.write_ptr,
1796 txq->q.read_ptr); 1796 txq->q.read_ptr);
@@ -1809,7 +1809,7 @@ static void il4965_rx_reply_tx(struct il_priv *il,
1809 1809
1810 sta_id = il4965_get_ra_sta_id(il, hdr); 1810 sta_id = il4965_get_ra_sta_id(il, hdr);
1811 if (txq->sched_retry && unlikely(sta_id == IL_INVALID_STATION)) { 1811 if (txq->sched_retry && unlikely(sta_id == IL_INVALID_STATION)) {
1812 IL_ERR(il, "Station not known\n"); 1812 IL_ERR("Station not known\n");
1813 return; 1813 return;
1814 } 1814 }
1815 1815
@@ -1943,7 +1943,7 @@ static void il4965_post_associate(struct il_priv *il)
1943 1943
1944 ret = il_send_rxon_timing(il, ctx); 1944 ret = il_send_rxon_timing(il, ctx);
1945 if (ret) 1945 if (ret)
1946 IL_WARN(il, "RXON timing - " 1946 IL_WARN("RXON timing - "
1947 "Attempting to continue.\n"); 1947 "Attempting to continue.\n");
1948 1948
1949 ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; 1949 ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -1982,7 +1982,7 @@ static void il4965_post_associate(struct il_priv *il)
1982 il4965_send_beacon_cmd(il); 1982 il4965_send_beacon_cmd(il);
1983 break; 1983 break;
1984 default: 1984 default:
1985 IL_ERR(il, "%s Should not be called in %d mode\n", 1985 IL_ERR("%s Should not be called in %d mode\n",
1986 __func__, vif->type); 1986 __func__, vif->type);
1987 break; 1987 break;
1988 } 1988 }
@@ -2019,7 +2019,7 @@ static void il4965_config_ap(struct il_priv *il)
2019 /* RXON Timing */ 2019 /* RXON Timing */
2020 ret = il_send_rxon_timing(il, ctx); 2020 ret = il_send_rxon_timing(il, ctx);
2021 if (ret) 2021 if (ret)
2022 IL_WARN(il, "RXON timing failed - " 2022 IL_WARN("RXON timing failed - "
2023 "Attempting to continue.\n"); 2023 "Attempting to continue.\n");
2024 2024
2025 /* AP has all antennas */ 2025 /* AP has all antennas */
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}
1189EXPORT_SYMBOL(il_send_bt_config); 1189EXPORT_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
diff --git a/drivers/net/wireless/iwlegacy/iwl-debug.h b/drivers/net/wireless/iwlegacy/iwl-debug.h
index 2c5c42fa4bb6..373188df7cc8 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debug.h
+++ b/drivers/net/wireless/iwlegacy/iwl-debug.h
@@ -32,10 +32,10 @@
32struct il_priv; 32struct il_priv;
33extern u32 il_debug_level; 33extern u32 il_debug_level;
34 34
35#define IL_ERR(p, f, a...) dev_err(&((p)->pci_dev->dev), f, ## a) 35#define IL_ERR(f, a...) dev_err(&il->pci_dev->dev, f, ## a)
36#define IL_WARN(p, f, a...) dev_warn(&((p)->pci_dev->dev), f, ## a) 36#define IL_WARN(f, a...) dev_warn(&il->pci_dev->dev, f, ## a)
37#define IL_INFO(p, f, a...) dev_info(&((p)->pci_dev->dev), f, ## a) 37#define IL_INFO(f, a...) dev_info(&il->pci_dev->dev, f, ## a)
38#define IL_CRIT(p, f, a...) dev_crit(&((p)->pci_dev->dev), f, ## a) 38#define IL_CRIT(f, a...) dev_crit(&il->pci_dev->dev, f, ## a)
39 39
40#define il_print_hex_error(il, p, len) \ 40#define il_print_hex_error(il, p, len) \
41do { \ 41do { \
diff --git a/drivers/net/wireless/iwlegacy/iwl-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
index a811c17e9c62..45b71a8b9af5 100644
--- a/drivers/net/wireless/iwlegacy/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
@@ -358,20 +358,20 @@ static ssize_t il_dbgfs_nvm_read(struct file *file,
358 buf_size = 4 * eeprom_len + 256; 358 buf_size = 4 * eeprom_len + 256;
359 359
360 if (eeprom_len % 16) { 360 if (eeprom_len % 16) {
361 IL_ERR(il, "NVM size is not multiple of 16.\n"); 361 IL_ERR("NVM size is not multiple of 16.\n");
362 return -ENODATA; 362 return -ENODATA;
363 } 363 }
364 364
365 ptr = il->eeprom; 365 ptr = il->eeprom;
366 if (!ptr) { 366 if (!ptr) {
367 IL_ERR(il, "Invalid EEPROM memory\n"); 367 IL_ERR("Invalid EEPROM memory\n");
368 return -ENOMEM; 368 return -ENOMEM;
369 } 369 }
370 370
371 /* 4 characters for byte 0xYY */ 371 /* 4 characters for byte 0xYY */
372 buf = kzalloc(buf_size, GFP_KERNEL); 372 buf = kzalloc(buf_size, GFP_KERNEL);
373 if (!buf) { 373 if (!buf) {
374 IL_ERR(il, "Can not allocate Buffer\n"); 374 IL_ERR("Can not allocate Buffer\n");
375 return -ENOMEM; 375 return -ENOMEM;
376 } 376 }
377 eeprom_ver = il_eeprom_query16(il, EEPROM_VERSION); 377 eeprom_ver = il_eeprom_query16(il, EEPROM_VERSION);
@@ -407,7 +407,7 @@ il_dbgfs_channels_read(struct file *file, char __user *user_buf,
407 407
408 buf = kzalloc(bufsz, GFP_KERNEL); 408 buf = kzalloc(bufsz, GFP_KERNEL);
409 if (!buf) { 409 if (!buf) {
410 IL_ERR(il, "Can not allocate Buffer\n"); 410 IL_ERR("Can not allocate Buffer\n");
411 return -ENOMEM; 411 return -ENOMEM;
412 } 412 }
413 413
@@ -519,7 +519,7 @@ static ssize_t il_dbgfs_interrupt_read(struct file *file,
519 519
520 buf = kzalloc(bufsz, GFP_KERNEL); 520 buf = kzalloc(bufsz, GFP_KERNEL);
521 if (!buf) { 521 if (!buf) {
522 IL_ERR(il, "Can not allocate Buffer\n"); 522 IL_ERR("Can not allocate Buffer\n");
523 return -ENOMEM; 523 return -ENOMEM;
524 } 524 }
525 525
@@ -640,7 +640,7 @@ static ssize_t il_dbgfs_disable_ht40_write(struct file *file,
640 if (!il_is_any_associated(il)) 640 if (!il_is_any_associated(il))
641 il->disable_ht40 = ht40 ? true : false; 641 il->disable_ht40 = ht40 ? true : false;
642 else { 642 else {
643 IL_ERR(il, "Sta associated with AP - " 643 IL_ERR("Sta associated with AP - "
644 "Change to 40MHz channel support is not allowed\n"); 644 "Change to 40MHz channel support is not allowed\n");
645 return -EINVAL; 645 return -EINVAL;
646 } 646 }
@@ -689,12 +689,12 @@ static ssize_t il_dbgfs_traffic_log_read(struct file *file,
689 ssize_t ret; 689 ssize_t ret;
690 690
691 if (!il->txq) { 691 if (!il->txq) {
692 IL_ERR(il, "txq not ready\n"); 692 IL_ERR("txq not ready\n");
693 return -EAGAIN; 693 return -EAGAIN;
694 } 694 }
695 buf = kzalloc(bufsz, GFP_KERNEL); 695 buf = kzalloc(bufsz, GFP_KERNEL);
696 if (!buf) { 696 if (!buf) {
697 IL_ERR(il, "Can not allocate buffer\n"); 697 IL_ERR("Can not allocate buffer\n");
698 return -ENOMEM; 698 return -ENOMEM;
699 } 699 }
700 pos += scnprintf(buf + pos, bufsz - pos, "Tx Queue\n"); 700 pos += scnprintf(buf + pos, bufsz - pos, "Tx Queue\n");
@@ -787,7 +787,7 @@ static ssize_t il_dbgfs_tx_queue_read(struct file *file,
787 il->cfg->base_params->num_of_queues; 787 il->cfg->base_params->num_of_queues;
788 788
789 if (!il->txq) { 789 if (!il->txq) {
790 IL_ERR(il, "txq not ready\n"); 790 IL_ERR("txq not ready\n");
791 return -EAGAIN; 791 return -EAGAIN;
792 } 792 }
793 buf = kzalloc(bufsz, GFP_KERNEL); 793 buf = kzalloc(bufsz, GFP_KERNEL);
@@ -884,7 +884,7 @@ static ssize_t il_dbgfs_sensitivity_read(struct file *file,
884 data = &il->sensitivity_data; 884 data = &il->sensitivity_data;
885 buf = kzalloc(bufsz, GFP_KERNEL); 885 buf = kzalloc(bufsz, GFP_KERNEL);
886 if (!buf) { 886 if (!buf) {
887 IL_ERR(il, "Can not allocate Buffer\n"); 887 IL_ERR("Can not allocate Buffer\n");
888 return -ENOMEM; 888 return -ENOMEM;
889 } 889 }
890 890
@@ -965,7 +965,7 @@ static ssize_t il_dbgfs_chain_noise_read(struct file *file,
965 data = &il->chain_noise_data; 965 data = &il->chain_noise_data;
966 buf = kzalloc(bufsz, GFP_KERNEL); 966 buf = kzalloc(bufsz, GFP_KERNEL);
967 if (!buf) { 967 if (!buf) {
968 IL_ERR(il, "Can not allocate Buffer\n"); 968 IL_ERR("Can not allocate Buffer\n");
969 return -ENOMEM; 969 return -ENOMEM;
970 } 970 }
971 971
@@ -1292,7 +1292,7 @@ int il_dbgfs_register(struct il_priv *il, const char *name)
1292 return 0; 1292 return 0;
1293 1293
1294err: 1294err:
1295 IL_ERR(il, "Can't create the debugfs directory\n"); 1295 IL_ERR("Can't create the debugfs directory\n");
1296 il_dbgfs_unregister(il); 1296 il_dbgfs_unregister(il);
1297 return -ENOMEM; 1297 return -ENOMEM;
1298} 1298}
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
index 33fe5989e820..5f0fd2afedfe 100644
--- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
@@ -153,7 +153,7 @@ static int il_eeprom_verify_signature(struct il_priv *il)
153 case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K: 153 case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
154 break; 154 break;
155 default: 155 default:
156 IL_ERR(il, "bad EEPROM signature," 156 IL_ERR("bad EEPROM signature,"
157 "EEPROM_GP=0x%08x\n", gp); 157 "EEPROM_GP=0x%08x\n", gp);
158 ret = -ENOENT; 158 ret = -ENOENT;
159 break; 159 break;
@@ -206,7 +206,7 @@ int il_eeprom_init(struct il_priv *il)
206 206
207 ret = il_eeprom_verify_signature(il); 207 ret = il_eeprom_verify_signature(il);
208 if (ret < 0) { 208 if (ret < 0) {
209 IL_ERR(il, "EEPROM not found, EEPROM_GP=0x%08x\n", gp); 209 IL_ERR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);
210 ret = -ENOENT; 210 ret = -ENOENT;
211 goto err; 211 goto err;
212 } 212 }
@@ -214,7 +214,7 @@ int il_eeprom_init(struct il_priv *il)
214 /* Make sure driver (instead of uCode) is allowed to read EEPROM */ 214 /* Make sure driver (instead of uCode) is allowed to read EEPROM */
215 ret = il->cfg->ops->lib->eeprom_ops.acquire_semaphore(il); 215 ret = il->cfg->ops->lib->eeprom_ops.acquire_semaphore(il);
216 if (ret < 0) { 216 if (ret < 0) {
217 IL_ERR(il, "Failed to acquire EEPROM semaphore.\n"); 217 IL_ERR("Failed to acquire EEPROM semaphore.\n");
218 ret = -ENOENT; 218 ret = -ENOENT;
219 goto err; 219 goto err;
220 } 220 }
@@ -231,7 +231,7 @@ int il_eeprom_init(struct il_priv *il)
231 CSR_EEPROM_REG_READ_VALID_MSK, 231 CSR_EEPROM_REG_READ_VALID_MSK,
232 IL_EEPROM_ACCESS_TIMEOUT); 232 IL_EEPROM_ACCESS_TIMEOUT);
233 if (ret < 0) { 233 if (ret < 0) {
234 IL_ERR(il, "Time out reading EEPROM[%d]\n", 234 IL_ERR("Time out reading EEPROM[%d]\n",
235 addr); 235 addr);
236 goto done; 236 goto done;
237 } 237 }
@@ -399,7 +399,7 @@ int il_init_channel_map(struct il_priv *il)
399 il->channel_info = kzalloc(sizeof(struct il_channel_info) * 399 il->channel_info = kzalloc(sizeof(struct il_channel_info) *
400 il->channel_count, GFP_KERNEL); 400 il->channel_count, GFP_KERNEL);
401 if (!il->channel_info) { 401 if (!il->channel_info) {
402 IL_ERR(il, "Could not allocate channel_info\n"); 402 IL_ERR("Could not allocate channel_info\n");
403 il->channel_count = 0; 403 il->channel_count = 0;
404 return -ENOMEM; 404 return -ENOMEM;
405 } 405 }
diff --git a/drivers/net/wireless/iwlegacy/iwl-hcmd.c b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
index 61cf0d83af57..8f87bd87f63d 100644
--- a/drivers/net/wireless/iwlegacy/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
@@ -95,7 +95,7 @@ static void il_generic_cmd_callback(struct il_priv *il,
95 struct il_rx_packet *pkt) 95 struct il_rx_packet *pkt)
96{ 96{
97 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 97 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
98 IL_ERR(il, "Bad return from %s (0x%08X)\n", 98 IL_ERR("Bad return from %s (0x%08X)\n",
99 il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags); 99 il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
100 return; 100 return;
101 } 101 }
@@ -133,7 +133,7 @@ il_send_cmd_async(struct il_priv *il, struct il_host_cmd *cmd)
133 133
134 ret = il_enqueue_hcmd(il, cmd); 134 ret = il_enqueue_hcmd(il, cmd);
135 if (ret < 0) { 135 if (ret < 0) {
136 IL_ERR(il, "Error sending %s: enqueue_hcmd failed: %d\n", 136 IL_ERR("Error sending %s: enqueue_hcmd failed: %d\n",
137 il_get_cmd_string(cmd->id), ret); 137 il_get_cmd_string(cmd->id), ret);
138 return ret; 138 return ret;
139 } 139 }
@@ -162,7 +162,7 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
162 cmd_idx = il_enqueue_hcmd(il, cmd); 162 cmd_idx = il_enqueue_hcmd(il, cmd);
163 if (cmd_idx < 0) { 163 if (cmd_idx < 0) {
164 ret = cmd_idx; 164 ret = cmd_idx;
165 IL_ERR(il, "Error sending %s: enqueue_hcmd failed: %d\n", 165 IL_ERR("Error sending %s: enqueue_hcmd failed: %d\n",
166 il_get_cmd_string(cmd->id), ret); 166 il_get_cmd_string(cmd->id), ret);
167 goto out; 167 goto out;
168 } 168 }
@@ -172,7 +172,7 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
172 HOST_COMPLETE_TIMEOUT); 172 HOST_COMPLETE_TIMEOUT);
173 if (!ret) { 173 if (!ret) {
174 if (test_bit(STATUS_HCMD_ACTIVE, &il->status)) { 174 if (test_bit(STATUS_HCMD_ACTIVE, &il->status)) {
175 IL_ERR(il, 175 IL_ERR(
176 "Error sending %s: time out after %dms.\n", 176 "Error sending %s: time out after %dms.\n",
177 il_get_cmd_string(cmd->id), 177 il_get_cmd_string(cmd->id),
178 jiffies_to_msecs(HOST_COMPLETE_TIMEOUT)); 178 jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
@@ -187,19 +187,19 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
187 } 187 }
188 188
189 if (test_bit(STATUS_RF_KILL_HW, &il->status)) { 189 if (test_bit(STATUS_RF_KILL_HW, &il->status)) {
190 IL_ERR(il, "Command %s aborted: RF KILL Switch\n", 190 IL_ERR("Command %s aborted: RF KILL Switch\n",
191 il_get_cmd_string(cmd->id)); 191 il_get_cmd_string(cmd->id));
192 ret = -ECANCELED; 192 ret = -ECANCELED;
193 goto fail; 193 goto fail;
194 } 194 }
195 if (test_bit(STATUS_FW_ERROR, &il->status)) { 195 if (test_bit(STATUS_FW_ERROR, &il->status)) {
196 IL_ERR(il, "Command %s failed: FW Error\n", 196 IL_ERR("Command %s failed: FW Error\n",
197 il_get_cmd_string(cmd->id)); 197 il_get_cmd_string(cmd->id));
198 ret = -EIO; 198 ret = -EIO;
199 goto fail; 199 goto fail;
200 } 200 }
201 if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) { 201 if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {
202 IL_ERR(il, "Error: Response NULL in '%s'\n", 202 IL_ERR("Error: Response NULL in '%s'\n",
203 il_get_cmd_string(cmd->id)); 203 il_get_cmd_string(cmd->id));
204 ret = -EIO; 204 ret = -EIO;
205 goto cancel; 205 goto cancel;
diff --git a/drivers/net/wireless/iwlegacy/iwl-io.h b/drivers/net/wireless/iwlegacy/iwl-io.h
index d6aae8daf3f0..1afd5c04d538 100644
--- a/drivers/net/wireless/iwlegacy/iwl-io.h
+++ b/drivers/net/wireless/iwlegacy/iwl-io.h
@@ -132,7 +132,7 @@ static inline int _il_grab_nic_access(struct il_priv *il)
132 CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000); 132 CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000);
133 if (ret < 0) { 133 if (ret < 0) {
134 val = _il_read32(il, CSR_GP_CNTRL); 134 val = _il_read32(il, CSR_GP_CNTRL);
135 IL_ERR(il, 135 IL_ERR(
136 "MAC is in deep sleep!. CSR_GP_CNTRL = 0x%08X\n", val); 136 "MAC is in deep sleep!. CSR_GP_CNTRL = 0x%08X\n", val);
137 _il_write32(il, CSR_RESET, 137 _il_write32(il, CSR_RESET,
138 CSR_RESET_REG_FLAG_FORCE_NMI); 138 CSR_RESET_REG_FLAG_FORCE_NMI);
diff --git a/drivers/net/wireless/iwlegacy/iwl-led.c b/drivers/net/wireless/iwlegacy/iwl-led.c
index b4d71cf7e398..a283804da10d 100644
--- a/drivers/net/wireless/iwlegacy/iwl-led.c
+++ b/drivers/net/wireless/iwlegacy/iwl-led.c
@@ -88,7 +88,7 @@ static inline u8 il_blink_compensation(struct il_priv *il,
88 u8 time, u16 compensation) 88 u8 time, u16 compensation)
89{ 89{
90 if (!compensation) { 90 if (!compensation) {
91 IL_ERR(il, "undefined blink compensation: " 91 IL_ERR("undefined blink compensation: "
92 "use pre-defined blinking time\n"); 92 "use pre-defined blinking time\n");
93 return time; 93 return time;
94 } 94 }
diff --git a/drivers/net/wireless/iwlegacy/iwl-power.c b/drivers/net/wireless/iwlegacy/iwl-power.c
index 33aec397247c..6c6e5e70c96f 100644
--- a/drivers/net/wireless/iwlegacy/iwl-power.c
+++ b/drivers/net/wireless/iwlegacy/iwl-power.c
@@ -136,7 +136,7 @@ il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd,
136 136
137 memcpy(&il->power_data.sleep_cmd, cmd, sizeof(*cmd)); 137 memcpy(&il->power_data.sleep_cmd, cmd, sizeof(*cmd));
138 } else 138 } else
139 IL_ERR(il, "set power fail, ret = %d", ret); 139 IL_ERR("set power fail, ret = %d", ret);
140 140
141 return ret; 141 return ret;
142} 142}
diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c
index c534dcef4a71..36871041cec0 100644
--- a/drivers/net/wireless/iwlegacy/iwl-scan.c
+++ b/drivers/net/wireless/iwlegacy/iwl-scan.c
@@ -341,7 +341,7 @@ static int il_scan_initiate(struct il_priv *il,
341 cancel_delayed_work(&il->scan_check); 341 cancel_delayed_work(&il->scan_check);
342 342
343 if (!il_is_ready_rf(il)) { 343 if (!il_is_ready_rf(il)) {
344 IL_WARN(il, "Request scan called when driver not ready.\n"); 344 IL_WARN("Request scan called when driver not ready.\n");
345 return -EIO; 345 return -EIO;
346 } 346 }
347 347
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c
index a48af855dc01..42033d2ef6d4 100644
--- a/drivers/net/wireless/iwlegacy/iwl-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-sta.c
@@ -41,7 +41,7 @@ static void il_sta_ucode_activate(struct il_priv *il, u8 sta_id)
41{ 41{
42 42
43 if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE)) 43 if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE))
44 IL_ERR(il, 44 IL_ERR(
45 "ACTIVATE a non DRIVER active station id %u addr %pM\n", 45 "ACTIVATE a non DRIVER active station id %u addr %pM\n",
46 sta_id, il->stations[sta_id].sta.sta.addr); 46 sta_id, il->stations[sta_id].sta.sta.addr);
47 47
@@ -67,7 +67,7 @@ static int il_process_add_sta_resp(struct il_priv *il,
67 int ret = -EIO; 67 int ret = -EIO;
68 68
69 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 69 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
70 IL_ERR(il, "Bad return from REPLY_ADD_STA (0x%08X)\n", 70 IL_ERR("Bad return from REPLY_ADD_STA (0x%08X)\n",
71 pkt->hdr.flags); 71 pkt->hdr.flags);
72 return ret; 72 return ret;
73 } 73 }
@@ -84,16 +84,16 @@ static int il_process_add_sta_resp(struct il_priv *il,
84 ret = 0; 84 ret = 0;
85 break; 85 break;
86 case ADD_STA_NO_ROOM_IN_TABLE: 86 case ADD_STA_NO_ROOM_IN_TABLE:
87 IL_ERR(il, "Adding station %d failed, no room in table.\n", 87 IL_ERR("Adding station %d failed, no room in table.\n",
88 sta_id); 88 sta_id);
89 break; 89 break;
90 case ADD_STA_NO_BLOCK_ACK_RESOURCE: 90 case ADD_STA_NO_BLOCK_ACK_RESOURCE:
91 IL_ERR(il, 91 IL_ERR(
92 "Adding station %d failed, no block ack resource.\n", 92 "Adding station %d failed, no block ack resource.\n",
93 sta_id); 93 sta_id);
94 break; 94 break;
95 case ADD_STA_MODIFY_NON_EXIST_STA: 95 case ADD_STA_MODIFY_NON_EXIST_STA:
96 IL_ERR(il, "Attempting to modify non-existing station %d\n", 96 IL_ERR("Attempting to modify non-existing station %d\n",
97 sta_id); 97 sta_id);
98 break; 98 break;
99 default: 99 default:
@@ -206,7 +206,7 @@ static void il_set_ht_add_station(struct il_priv *il, u8 index,
206 case WLAN_HT_CAP_SM_PS_DISABLED: 206 case WLAN_HT_CAP_SM_PS_DISABLED:
207 break; 207 break;
208 default: 208 default:
209 IL_WARN(il, "Invalid MIMO PS mode %d\n", mimo_ps_mode); 209 IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);
210 break; 210 break;
211 } 211 }
212 212
@@ -343,7 +343,7 @@ il_add_station_common(struct il_priv *il,
343 spin_lock_irqsave(&il->sta_lock, flags_spin); 343 spin_lock_irqsave(&il->sta_lock, flags_spin);
344 sta_id = il_prep_station(il, ctx, addr, is_ap, sta); 344 sta_id = il_prep_station(il, ctx, addr, is_ap, sta);
345 if (sta_id == IL_INVALID_STATION) { 345 if (sta_id == IL_INVALID_STATION) {
346 IL_ERR(il, "Unable to prepare station %pM for addition\n", 346 IL_ERR("Unable to prepare station %pM for addition\n",
347 addr); 347 addr);
348 spin_unlock_irqrestore(&il->sta_lock, flags_spin); 348 spin_unlock_irqrestore(&il->sta_lock, flags_spin);
349 return -EINVAL; 349 return -EINVAL;
@@ -380,7 +380,7 @@ il_add_station_common(struct il_priv *il,
380 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC); 380 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
381 if (ret) { 381 if (ret) {
382 spin_lock_irqsave(&il->sta_lock, flags_spin); 382 spin_lock_irqsave(&il->sta_lock, flags_spin);
383 IL_ERR(il, "Adding station %pM failed.\n", 383 IL_ERR("Adding station %pM failed.\n",
384 il->stations[sta_id].sta.sta.addr); 384 il->stations[sta_id].sta.sta.addr);
385 il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE; 385 il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE;
386 il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS; 386 il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
@@ -402,7 +402,7 @@ static void il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id)
402 if ((il->stations[sta_id].used & 402 if ((il->stations[sta_id].used &
403 (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) != 403 (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) !=
404 IL_STA_UCODE_ACTIVE) 404 IL_STA_UCODE_ACTIVE)
405 IL_ERR(il, "removed non active STA %u\n", sta_id); 405 IL_ERR("removed non active STA %u\n", sta_id);
406 406
407 il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE; 407 il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE;
408 408
@@ -440,7 +440,7 @@ static int il_send_remove_station(struct il_priv *il,
440 440
441 pkt = (struct il_rx_packet *)cmd.reply_page; 441 pkt = (struct il_rx_packet *)cmd.reply_page;
442 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 442 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
443 IL_ERR(il, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", 443 IL_ERR("Bad return from REPLY_REMOVE_STA (0x%08X)\n",
444 pkt->hdr.flags); 444 pkt->hdr.flags);
445 ret = -EIO; 445 ret = -EIO;
446 } 446 }
@@ -458,7 +458,7 @@ static int il_send_remove_station(struct il_priv *il,
458 break; 458 break;
459 default: 459 default:
460 ret = -EIO; 460 ret = -EIO;
461 IL_ERR(il, "REPLY_REMOVE_STA failed\n"); 461 IL_ERR("REPLY_REMOVE_STA failed\n");
462 break; 462 break;
463 } 463 }
464 } 464 }
@@ -618,7 +618,7 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
618 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC); 618 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
619 if (ret) { 619 if (ret) {
620 spin_lock_irqsave(&il->sta_lock, flags_spin); 620 spin_lock_irqsave(&il->sta_lock, flags_spin);
621 IL_ERR(il, "Adding station %pM failed.\n", 621 IL_ERR("Adding station %pM failed.\n",
622 il->stations[i].sta.sta.addr); 622 il->stations[i].sta.sta.addr);
623 il->stations[i].used &= 623 il->stations[i].used &=
624 ~IL_STA_DRIVER_ACTIVE; 624 ~IL_STA_DRIVER_ACTIVE;
@@ -808,7 +808,7 @@ int il_mac_sta_remove(struct ieee80211_hw *hw,
808 sta->addr); 808 sta->addr);
809 ret = il_remove_station(il, sta_common->sta_id, sta->addr); 809 ret = il_remove_station(il, sta_common->sta_id, sta->addr);
810 if (ret) 810 if (ret)
811 IL_ERR(il, "Error removing station %pM\n", 811 IL_ERR("Error removing station %pM\n",
812 sta->addr); 812 sta->addr);
813 mutex_unlock(&il->mutex); 813 mutex_unlock(&il->mutex);
814 return ret; 814 return ret;
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c
index 22617c47fc77..cfc015ae203b 100644
--- a/drivers/net/wireless/iwlegacy/iwl-tx.c
+++ b/drivers/net/wireless/iwlegacy/iwl-tx.c
@@ -299,7 +299,7 @@ static int il_tx_queue_alloc(struct il_priv *il,
299 txq->txb = kzalloc(sizeof(txq->txb[0]) * 299 txq->txb = kzalloc(sizeof(txq->txb[0]) *
300 TFD_QUEUE_SIZE_MAX, GFP_KERNEL); 300 TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
301 if (!txq->txb) { 301 if (!txq->txb) {
302 IL_ERR(il, "kmalloc for auxiliary BD " 302 IL_ERR("kmalloc for auxiliary BD "
303 "structures failed\n"); 303 "structures failed\n");
304 goto error; 304 goto error;
305 } 305 }
@@ -312,7 +312,7 @@ static int il_tx_queue_alloc(struct il_priv *il,
312 txq->tfds = dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, 312 txq->tfds = dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr,
313 GFP_KERNEL); 313 GFP_KERNEL);
314 if (!txq->tfds) { 314 if (!txq->tfds) {
315 IL_ERR(il, "pci_alloc_consistent(%zd) failed\n", tfd_sz); 315 IL_ERR("pci_alloc_consistent(%zd) failed\n", tfd_sz);
316 goto error; 316 goto error;
317 } 317 }
318 txq->q.id = id; 318 txq->q.id = id;
@@ -461,7 +461,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)
461 BUG_ON(fix_size > IL_MAX_CMD_SIZE); 461 BUG_ON(fix_size > IL_MAX_CMD_SIZE);
462 462
463 if (il_is_rfkill(il) || il_is_ctkill(il)) { 463 if (il_is_rfkill(il) || il_is_ctkill(il)) {
464 IL_WARN(il, "Not sending command - %s KILL\n", 464 IL_WARN("Not sending command - %s KILL\n",
465 il_is_rfkill(il) ? "RF" : "CT"); 465 il_is_rfkill(il) ? "RF" : "CT");
466 return -EIO; 466 return -EIO;
467 } 467 }
@@ -471,7 +471,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)
471 if (il_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) { 471 if (il_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {
472 spin_unlock_irqrestore(&il->hcmd_lock, flags); 472 spin_unlock_irqrestore(&il->hcmd_lock, flags);
473 473
474 IL_ERR(il, "Restarting adapter due to command queue full\n"); 474 IL_ERR("Restarting adapter due to command queue full\n");
475 queue_work(il->workqueue, &il->restart); 475 queue_work(il->workqueue, &il->restart);
476 return -ENOSPC; 476 return -ENOSPC;
477 } 477 }
@@ -566,7 +566,7 @@ static void il_hcmd_queue_reclaim(struct il_priv *il, int txq_id,
566 int nfreed = 0; 566 int nfreed = 0;
567 567
568 if ((idx >= q->n_bd) || (il_queue_used(q, idx) == 0)) { 568 if ((idx >= q->n_bd) || (il_queue_used(q, idx) == 0)) {
569 IL_ERR(il, "Read index for DMA queue txq id (%d), index %d, " 569 IL_ERR("Read index for DMA queue txq id (%d), index %d, "
570 "is out of range [0-%d] %d %d.\n", txq_id, 570 "is out of range [0-%d] %d %d.\n", txq_id,
571 idx, q->n_bd, q->write_ptr, q->read_ptr); 571 idx, q->n_bd, q->write_ptr, q->read_ptr);
572 return; 572 return;
@@ -576,7 +576,7 @@ static void il_hcmd_queue_reclaim(struct il_priv *il, int txq_id,
576 q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) { 576 q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) {
577 577
578 if (nfreed++ > 0) { 578 if (nfreed++ > 0) {
579 IL_ERR(il, "HCMD skipped: index (%d) %d %d\n", idx, 579 IL_ERR("HCMD skipped: index (%d) %d %d\n", idx,
580 q->write_ptr, q->read_ptr); 580 q->write_ptr, q->read_ptr);
581 queue_work(il->workqueue, &il->restart); 581 queue_work(il->workqueue, &il->restart);
582 } 582 }
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index 8aa22a01ae68..8a6b1937336c 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -127,7 +127,7 @@ __le32 il3945_get_antenna_flags(const struct il_priv *il)
127 } 127 }
128 128
129 /* bad antenna selector value */ 129 /* bad antenna selector value */
130 IL_ERR(il, "Bad antenna selector value (0x%x)\n", 130 IL_ERR("Bad antenna selector value (0x%x)\n",
131 il3945_mod_params.antenna); 131 il3945_mod_params.antenna);
132 132
133 return 0; /* "diversity" is default if error */ 133 return 0; /* "diversity" is default if error */
@@ -236,7 +236,7 @@ static int il3945_set_dynamic_key(struct il_priv *il,
236 ret = il3945_set_wep_dynamic_key_info(il, keyconf, sta_id); 236 ret = il3945_set_wep_dynamic_key_info(il, keyconf, sta_id);
237 break; 237 break;
238 default: 238 default:
239 IL_ERR(il, "Unknown alg: %s alg=%x\n", __func__, 239 IL_ERR("Unknown alg: %s alg=%x\n", __func__,
240 keyconf->cipher); 240 keyconf->cipher);
241 ret = -EINVAL; 241 ret = -EINVAL;
242 } 242 }
@@ -262,7 +262,7 @@ static int il3945_set_static_key(struct il_priv *il,
262 key->cipher == WLAN_CIPHER_SUITE_WEP104) 262 key->cipher == WLAN_CIPHER_SUITE_WEP104)
263 return -EOPNOTSUPP; 263 return -EOPNOTSUPP;
264 264
265 IL_ERR(il, "Static key invalid: cipher %x\n", key->cipher); 265 IL_ERR("Static key invalid: cipher %x\n", key->cipher);
266 return -EINVAL; 266 return -EINVAL;
267} 267}
268 268
@@ -281,7 +281,7 @@ static void il3945_clear_free_frames(struct il_priv *il)
281 } 281 }
282 282
283 if (il->frames_count) { 283 if (il->frames_count) {
284 IL_WARN(il, "%d frames still in use. Did we lose one?\n", 284 IL_WARN("%d frames still in use. Did we lose one?\n",
285 il->frames_count); 285 il->frames_count);
286 il->frames_count = 0; 286 il->frames_count = 0;
287 } 287 }
@@ -294,7 +294,7 @@ static struct il3945_frame *il3945_get_free_frame(struct il_priv *il)
294 if (list_empty(&il->free_frames)) { 294 if (list_empty(&il->free_frames)) {
295 frame = kzalloc(sizeof(*frame), GFP_KERNEL); 295 frame = kzalloc(sizeof(*frame), GFP_KERNEL);
296 if (!frame) { 296 if (!frame) {
297 IL_ERR(il, "Could not allocate frame!\n"); 297 IL_ERR("Could not allocate frame!\n");
298 return NULL; 298 return NULL;
299 } 299 }
300 300
@@ -339,7 +339,7 @@ static int il3945_send_beacon_cmd(struct il_priv *il)
339 frame = il3945_get_free_frame(il); 339 frame = il3945_get_free_frame(il);
340 340
341 if (!frame) { 341 if (!frame) {
342 IL_ERR(il, "Could not obtain free frame buffer for beacon " 342 IL_ERR("Could not obtain free frame buffer for beacon "
343 "command.\n"); 343 "command.\n");
344 return -ENOMEM; 344 return -ENOMEM;
345 } 345 }
@@ -401,7 +401,7 @@ static void il3945_build_tx_cmd_hwcrypto(struct il_priv *il,
401 break; 401 break;
402 402
403 default: 403 default:
404 IL_ERR(il, "Unknown encode cipher %x\n", keyinfo->cipher); 404 IL_ERR("Unknown encode cipher %x\n", keyinfo->cipher);
405 break; 405 break;
406 } 406 }
407} 407}
@@ -491,7 +491,7 @@ static int il3945_tx_skb(struct il_priv *il, struct sk_buff *skb)
491 } 491 }
492 492
493 if ((ieee80211_get_tx_rate(il->hw, info)->hw_value & 0xFF) == IL_INVALID_RATE) { 493 if ((ieee80211_get_tx_rate(il->hw, info)->hw_value & 0xFF) == IL_INVALID_RATE) {
494 IL_ERR(il, "ERROR: No TX rate available.\n"); 494 IL_ERR("ERROR: No TX rate available.\n");
495 goto drop_unlock; 495 goto drop_unlock;
496 } 496 }
497 497
@@ -718,7 +718,7 @@ static int il3945_get_measurement(struct il_priv *il,
718 718
719 pkt = (struct il_rx_packet *)cmd.reply_page; 719 pkt = (struct il_rx_packet *)cmd.reply_page;
720 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 720 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
721 IL_ERR(il, "Bad return from REPLY_RX_ON_ASSOC command\n"); 721 IL_ERR("Bad return from REPLY_RX_ON_ASSOC command\n");
722 rc = -EIO; 722 rc = -EIO;
723 } 723 }
724 724
@@ -777,7 +777,7 @@ static void il3945_rx_reply_alive(struct il_priv *il,
777 queue_delayed_work(il->workqueue, pwork, 777 queue_delayed_work(il->workqueue, pwork,
778 msecs_to_jiffies(5)); 778 msecs_to_jiffies(5));
779 else 779 else
780 IL_WARN(il, "uCode did not respond OK.\n"); 780 IL_WARN("uCode did not respond OK.\n");
781} 781}
782 782
783static void il3945_rx_reply_add_sta(struct il_priv *il, 783static void il3945_rx_reply_add_sta(struct il_priv *il,
@@ -820,7 +820,7 @@ static void il3945_rx_card_state_notif(struct il_priv *il,
820 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); 820 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
821 unsigned long status = il->status; 821 unsigned long status = il->status;
822 822
823 IL_WARN(il, "Card state received: HW:%s SW:%s\n", 823 IL_WARN("Card state received: HW:%s SW:%s\n",
824 (flags & HW_CARD_DISABLED) ? "Kill" : "On", 824 (flags & HW_CARD_DISABLED) ? "Kill" : "On",
825 (flags & SW_CARD_DISABLED) ? "Kill" : "On"); 825 (flags & SW_CARD_DISABLED) ? "Kill" : "On");
826 826
@@ -1043,7 +1043,7 @@ static void il3945_rx_allocate(struct il_priv *il, gfp_t priority)
1043 D_INFO("Failed to allocate SKB buffer.\n"); 1043 D_INFO("Failed to allocate SKB buffer.\n");
1044 if ((rxq->free_count <= RX_LOW_WATERMARK) && 1044 if ((rxq->free_count <= RX_LOW_WATERMARK) &&
1045 net_ratelimit()) 1045 net_ratelimit())
1046 IL_CRIT(il, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n", 1046 IL_CRIT("Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
1047 priority == GFP_ATOMIC ? "GFP_ATOMIC" : "GFP_KERNEL", 1047 priority == GFP_ATOMIC ? "GFP_ATOMIC" : "GFP_KERNEL",
1048 rxq->free_count); 1048 rxq->free_count);
1049 /* We don't reschedule replenish work here -- we will 1049 /* We don't reschedule replenish work here -- we will
@@ -1287,7 +1287,7 @@ static void il3945_rx_handle(struct il_priv *il)
1287 if (rxb->page) 1287 if (rxb->page)
1288 il_tx_cmd_complete(il, rxb); 1288 il_tx_cmd_complete(il, rxb);
1289 else 1289 else
1290 IL_WARN(il, "Claim null rxb?\n"); 1290 IL_WARN("Claim null rxb?\n");
1291 } 1291 }
1292 1292
1293 /* Reuse the page if possible. For notification packets and 1293 /* Reuse the page if possible. For notification packets and
@@ -1366,7 +1366,7 @@ void il3945_dump_nic_error_log(struct il_priv *il)
1366 base = le32_to_cpu(il->card_alive.error_event_table_ptr); 1366 base = le32_to_cpu(il->card_alive.error_event_table_ptr);
1367 1367
1368 if (!il3945_hw_valid_rtc_data_addr(base)) { 1368 if (!il3945_hw_valid_rtc_data_addr(base)) {
1369 IL_ERR(il, "Not valid error log pointer 0x%08X\n", base); 1369 IL_ERR("Not valid error log pointer 0x%08X\n", base);
1370 return; 1370 return;
1371 } 1371 }
1372 1372
@@ -1374,12 +1374,12 @@ void il3945_dump_nic_error_log(struct il_priv *il)
1374 count = il_read_targ_mem(il, base); 1374 count = il_read_targ_mem(il, base);
1375 1375
1376 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { 1376 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
1377 IL_ERR(il, "Start IWL Error Log Dump:\n"); 1377 IL_ERR("Start IWL Error Log Dump:\n");
1378 IL_ERR(il, "Status: 0x%08lX, count: %d\n", 1378 IL_ERR("Status: 0x%08lX, count: %d\n",
1379 il->status, count); 1379 il->status, count);
1380 } 1380 }
1381 1381
1382 IL_ERR(il, "Desc Time asrtPC blink2 " 1382 IL_ERR("Desc Time asrtPC blink2 "
1383 "ilink1 nmiPC Line\n"); 1383 "ilink1 nmiPC Line\n");
1384 for (i = ERROR_START_OFFSET; 1384 for (i = ERROR_START_OFFSET;
1385 i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET; 1385 i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;
@@ -1398,7 +1398,7 @@ void il3945_dump_nic_error_log(struct il_priv *il)
1398 data1 = 1398 data1 =
1399 il_read_targ_mem(il, base + i + 6 * sizeof(u32)); 1399 il_read_targ_mem(il, base + i + 6 * sizeof(u32));
1400 1400
1401 IL_ERR(il, 1401 IL_ERR(
1402 "%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n", 1402 "%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
1403 il3945_desc_lookup(desc), desc, time, blink1, blink2, 1403 il3945_desc_lookup(desc), desc, time, blink1, blink2,
1404 ilink1, ilink2, data1); 1404 ilink1, ilink2, data1);
@@ -1450,7 +1450,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
1450 1450
1451 /* Now service all interrupt bits discovered above. */ 1451 /* Now service all interrupt bits discovered above. */
1452 if (inta & CSR_INT_BIT_HW_ERR) { 1452 if (inta & CSR_INT_BIT_HW_ERR) {
1453 IL_ERR(il, "Hardware error detected. Restarting.\n"); 1453 IL_ERR("Hardware error detected. Restarting.\n");
1454 1454
1455 /* Tell the device to stop sending interrupts */ 1455 /* Tell the device to stop sending interrupts */
1456 il_disable_interrupts(il); 1456 il_disable_interrupts(il);
@@ -1484,7 +1484,7 @@ static void il3945_irq_tasklet(struct il_priv *il)
1484 1484
1485 /* Error detected by uCode */ 1485 /* Error detected by uCode */
1486 if (inta & CSR_INT_BIT_SW_ERR) { 1486 if (inta & CSR_INT_BIT_SW_ERR) {
1487 IL_ERR(il, "Microcode SW error detected. " 1487 IL_ERR("Microcode SW error detected. "
1488 "Restarting 0x%X.\n", inta); 1488 "Restarting 0x%X.\n", inta);
1489 il->isr_stats.sw++; 1489 il->isr_stats.sw++;
1490 il_irq_handle_error(il); 1490 il_irq_handle_error(il);
@@ -1526,14 +1526,14 @@ static void il3945_irq_tasklet(struct il_priv *il)
1526 } 1526 }
1527 1527
1528 if (inta & ~handled) { 1528 if (inta & ~handled) {
1529 IL_ERR(il, "Unhandled INTA bits 0x%08x\n", inta & ~handled); 1529 IL_ERR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
1530 il->isr_stats.unhandled++; 1530 il->isr_stats.unhandled++;
1531 } 1531 }
1532 1532
1533 if (inta & ~il->inta_mask) { 1533 if (inta & ~il->inta_mask) {
1534 IL_WARN(il, "Disabled INTA bits 0x%08x were pending\n", 1534 IL_WARN("Disabled INTA bits 0x%08x were pending\n",
1535 inta & ~il->inta_mask); 1535 inta & ~il->inta_mask);
1536 IL_WARN(il, " with FH_INT = 0x%08x\n", inta_fh); 1536 IL_WARN(" with FH_INT = 0x%08x\n", inta_fh);
1537 } 1537 }
1538 1538
1539 /* Re-enable all interrupts */ 1539 /* Re-enable all interrupts */
@@ -1708,7 +1708,7 @@ static int il3945_verify_inst_full(struct il_priv *il, __le32 *image, u32 len)
1708 * if IL_DL_IO is set */ 1708 * if IL_DL_IO is set */
1709 val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT); 1709 val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT);
1710 if (val != le32_to_cpu(*image)) { 1710 if (val != le32_to_cpu(*image)) {
1711 IL_ERR(il, "uCode INST section is invalid at " 1711 IL_ERR("uCode INST section is invalid at "
1712 "offset 0x%x, is 0x%x, s/b 0x%x\n", 1712 "offset 0x%x, is 0x%x, s/b 0x%x\n",
1713 save_len - len, val, le32_to_cpu(*image)); 1713 save_len - len, val, le32_to_cpu(*image));
1714 rc = -EIO; 1714 rc = -EIO;
@@ -1750,7 +1750,7 @@ static int il3945_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len)
1750 val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT); 1750 val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT);
1751 if (val != le32_to_cpu(*image)) { 1751 if (val != le32_to_cpu(*image)) {
1752#if 0 /* Enable this if you want to see details */ 1752#if 0 /* Enable this if you want to see details */
1753 IL_ERR(il, "uCode INST section is invalid at " 1753 IL_ERR("uCode INST section is invalid at "
1754 "offset 0x%x, is 0x%x, s/b 0x%x\n", 1754 "offset 0x%x, is 0x%x, s/b 0x%x\n",
1755 i, val, *image); 1755 i, val, *image);
1756#endif 1756#endif
@@ -1802,7 +1802,7 @@ static int il3945_verify_ucode(struct il_priv *il)
1802 return 0; 1802 return 0;
1803 } 1803 }
1804 1804
1805 IL_ERR(il, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n"); 1805 IL_ERR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
1806 1806
1807 /* Since nothing seems to match, show first several data entries in 1807 /* Since nothing seems to match, show first several data entries in
1808 * instruction SRAM, so maybe visual inspection will give a clue. 1808 * instruction SRAM, so maybe visual inspection will give a clue.
@@ -1867,7 +1867,7 @@ static int il3945_read_ucode(struct il_priv *il)
1867 sprintf(buf, "%s%u%s", name_pre, index, ".ucode"); 1867 sprintf(buf, "%s%u%s", name_pre, index, ".ucode");
1868 ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev); 1868 ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev);
1869 if (ret < 0) { 1869 if (ret < 0) {
1870 IL_ERR(il, "%s firmware file req failed: %d\n", 1870 IL_ERR("%s firmware file req failed: %d\n",
1871 buf, ret); 1871 buf, ret);
1872 if (ret == -ENOENT) 1872 if (ret == -ENOENT)
1873 continue; 1873 continue;
@@ -1875,7 +1875,7 @@ static int il3945_read_ucode(struct il_priv *il)
1875 goto error; 1875 goto error;
1876 } else { 1876 } else {
1877 if (index < api_max) 1877 if (index < api_max)
1878 IL_ERR(il, "Loaded firmware %s, " 1878 IL_ERR("Loaded firmware %s, "
1879 "which is deprecated. " 1879 "which is deprecated. "
1880 " Please use API v%u instead.\n", 1880 " Please use API v%u instead.\n",
1881 buf, api_max); 1881 buf, api_max);
@@ -1891,7 +1891,7 @@ static int il3945_read_ucode(struct il_priv *il)
1891 1891
1892 /* Make sure that we got at least our header! */ 1892 /* Make sure that we got at least our header! */
1893 if (ucode_raw->size < il3945_ucode_get_header_size(1)) { 1893 if (ucode_raw->size < il3945_ucode_get_header_size(1)) {
1894 IL_ERR(il, "File size way too small!\n"); 1894 IL_ERR("File size way too small!\n");
1895 ret = -EINVAL; 1895 ret = -EINVAL;
1896 goto err_release; 1896 goto err_release;
1897 } 1897 }
@@ -1913,7 +1913,7 @@ static int il3945_read_ucode(struct il_priv *il)
1913 * on the API version read from firmware header from here on forward */ 1913 * on the API version read from firmware header from here on forward */
1914 1914
1915 if (api_ver < api_min || api_ver > api_max) { 1915 if (api_ver < api_min || api_ver > api_max) {
1916 IL_ERR(il, "Driver unable to support your firmware API. " 1916 IL_ERR("Driver unable to support your firmware API. "
1917 "Driver supports v%u, firmware is v%u.\n", 1917 "Driver supports v%u, firmware is v%u.\n",
1918 api_max, api_ver); 1918 api_max, api_ver);
1919 il->ucode_ver = 0; 1919 il->ucode_ver = 0;
@@ -1921,12 +1921,12 @@ static int il3945_read_ucode(struct il_priv *il)
1921 goto err_release; 1921 goto err_release;
1922 } 1922 }
1923 if (api_ver != api_max) 1923 if (api_ver != api_max)
1924 IL_ERR(il, "Firmware has old API version. Expected %u, " 1924 IL_ERR("Firmware has old API version. Expected %u, "
1925 "got %u. New firmware can be obtained " 1925 "got %u. New firmware can be obtained "
1926 "from http://www.intellinuxwireless.org.\n", 1926 "from http://www.intellinuxwireless.org.\n",
1927 api_max, api_ver); 1927 api_max, api_ver);
1928 1928
1929 IL_INFO(il, "loaded firmware version %u.%u.%u.%u\n", 1929 IL_INFO("loaded firmware version %u.%u.%u.%u\n",
1930 IL_UCODE_MAJOR(il->ucode_ver), 1930 IL_UCODE_MAJOR(il->ucode_ver),
1931 IL_UCODE_MINOR(il->ucode_ver), 1931 IL_UCODE_MINOR(il->ucode_ver),
1932 IL_UCODE_API(il->ucode_ver), 1932 IL_UCODE_API(il->ucode_ver),
@@ -2091,7 +2091,7 @@ static int il3945_read_ucode(struct il_priv *il)
2091 return 0; 2091 return 0;
2092 2092
2093 err_pci_alloc: 2093 err_pci_alloc:
2094 IL_ERR(il, "failed to allocate pci memory\n"); 2094 IL_ERR("failed to allocate pci memory\n");
2095 ret = -ENOMEM; 2095 ret = -ENOMEM;
2096 il3945_dealloc_ucode_pci(il); 2096 il3945_dealloc_ucode_pci(il);
2097 2097
@@ -2380,7 +2380,7 @@ static int il3945_alloc_bcast_station(struct il_priv *il)
2380 sta_id = il_prep_station(il, ctx, 2380 sta_id = il_prep_station(il, ctx,
2381 il_bcast_addr, false, NULL); 2381 il_bcast_addr, false, NULL);
2382 if (sta_id == IL_INVALID_STATION) { 2382 if (sta_id == IL_INVALID_STATION) {
2383 IL_ERR(il, "Unable to prepare broadcast station\n"); 2383 IL_ERR("Unable to prepare broadcast station\n");
2384 spin_unlock_irqrestore(&il->sta_lock, flags); 2384 spin_unlock_irqrestore(&il->sta_lock, flags);
2385 2385
2386 return -EINVAL; 2386 return -EINVAL;
@@ -2402,12 +2402,12 @@ static int __il3945_up(struct il_priv *il)
2402 return rc; 2402 return rc;
2403 2403
2404 if (test_bit(STATUS_EXIT_PENDING, &il->status)) { 2404 if (test_bit(STATUS_EXIT_PENDING, &il->status)) {
2405 IL_WARN(il, "Exit pending; will not bring the NIC up\n"); 2405 IL_WARN("Exit pending; will not bring the NIC up\n");
2406 return -EIO; 2406 return -EIO;
2407 } 2407 }
2408 2408
2409 if (!il->ucode_data_backup.v_addr || !il->ucode_data.v_addr) { 2409 if (!il->ucode_data_backup.v_addr || !il->ucode_data.v_addr) {
2410 IL_ERR(il, "ucode not available for device bring up\n"); 2410 IL_ERR("ucode not available for device bring up\n");
2411 return -EIO; 2411 return -EIO;
2412 } 2412 }
2413 2413
@@ -2417,7 +2417,7 @@ static int __il3945_up(struct il_priv *il)
2417 clear_bit(STATUS_RF_KILL_HW, &il->status); 2417 clear_bit(STATUS_RF_KILL_HW, &il->status);
2418 else { 2418 else {
2419 set_bit(STATUS_RF_KILL_HW, &il->status); 2419 set_bit(STATUS_RF_KILL_HW, &il->status);
2420 IL_WARN(il, "Radio disabled by HW RF Kill switch\n"); 2420 IL_WARN("Radio disabled by HW RF Kill switch\n");
2421 return -ENODEV; 2421 return -ENODEV;
2422 } 2422 }
2423 2423
@@ -2425,7 +2425,7 @@ static int __il3945_up(struct il_priv *il)
2425 2425
2426 rc = il3945_hw_nic_init(il); 2426 rc = il3945_hw_nic_init(il);
2427 if (rc) { 2427 if (rc) {
2428 IL_ERR(il, "Unable to int nic\n"); 2428 IL_ERR("Unable to int nic\n");
2429 return rc; 2429 return rc;
2430 } 2430 }
2431 2431
@@ -2460,7 +2460,7 @@ static int __il3945_up(struct il_priv *il)
2460 rc = il->cfg->ops->lib->load_ucode(il); 2460 rc = il->cfg->ops->lib->load_ucode(il);
2461 2461
2462 if (rc) { 2462 if (rc) {
2463 IL_ERR(il, 2463 IL_ERR(
2464 "Unable to set up bootstrap uCode: %d\n", rc); 2464 "Unable to set up bootstrap uCode: %d\n", rc);
2465 continue; 2465 continue;
2466 } 2466 }
@@ -2479,7 +2479,7 @@ static int __il3945_up(struct il_priv *il)
2479 2479
2480 /* tried to restart and config the device for as long as our 2480 /* tried to restart and config the device for as long as our
2481 * patience could withstand */ 2481 * patience could withstand */
2482 IL_ERR(il, "Unable to initialize device after %d attempts.\n", i); 2482 IL_ERR("Unable to initialize device after %d attempts.\n", i);
2483 return -EIO; 2483 return -EIO;
2484} 2484}
2485 2485
@@ -2650,7 +2650,7 @@ int il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
2650 band = IEEE80211_BAND_5GHZ; 2650 band = IEEE80211_BAND_5GHZ;
2651 break; 2651 break;
2652 default: 2652 default:
2653 IL_WARN(il, "Invalid scan band\n"); 2653 IL_WARN("Invalid scan band\n");
2654 return -EIO; 2654 return -EIO;
2655 } 2655 }
2656 2656
@@ -2770,7 +2770,7 @@ void il3945_post_associate(struct il_priv *il)
2770 2770
2771 rc = il_send_rxon_timing(il, ctx); 2771 rc = il_send_rxon_timing(il, ctx);
2772 if (rc) 2772 if (rc)
2773 IL_WARN(il, "REPLY_RXON_TIMING failed - " 2773 IL_WARN("REPLY_RXON_TIMING failed - "
2774 "Attempting to continue.\n"); 2774 "Attempting to continue.\n");
2775 2775
2776 ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; 2776 ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -2802,7 +2802,7 @@ void il3945_post_associate(struct il_priv *il)
2802 il3945_send_beacon_cmd(il); 2802 il3945_send_beacon_cmd(il);
2803 break; 2803 break;
2804 default: 2804 default:
2805 IL_ERR(il, "%s Should not be called in %d mode\n", 2805 IL_ERR("%s Should not be called in %d mode\n",
2806 __func__, ctx->vif->type); 2806 __func__, ctx->vif->type);
2807 break; 2807 break;
2808 } 2808 }
@@ -2832,7 +2832,7 @@ static int il3945_mac_start(struct ieee80211_hw *hw)
2832 if (!il->ucode_code.len) { 2832 if (!il->ucode_code.len) {
2833 ret = il3945_read_ucode(il); 2833 ret = il3945_read_ucode(il);
2834 if (ret) { 2834 if (ret) {
2835 IL_ERR(il, "Could not read microcode: %d\n", ret); 2835 IL_ERR("Could not read microcode: %d\n", ret);
2836 mutex_unlock(&il->mutex); 2836 mutex_unlock(&il->mutex);
2837 goto out_release_irq; 2837 goto out_release_irq;
2838 } 2838 }
@@ -2854,7 +2854,7 @@ static int il3945_mac_start(struct ieee80211_hw *hw)
2854 UCODE_READY_TIMEOUT); 2854 UCODE_READY_TIMEOUT);
2855 if (!ret) { 2855 if (!ret) {
2856 if (!test_bit(STATUS_READY, &il->status)) { 2856 if (!test_bit(STATUS_READY, &il->status)) {
2857 IL_ERR(il, 2857 IL_ERR(
2858 "Wait for START_ALIVE timeout after %dms.\n", 2858 "Wait for START_ALIVE timeout after %dms.\n",
2859 jiffies_to_msecs(UCODE_READY_TIMEOUT)); 2859 jiffies_to_msecs(UCODE_READY_TIMEOUT));
2860 ret = -ETIMEDOUT; 2860 ret = -ETIMEDOUT;
@@ -2934,7 +2934,7 @@ void il3945_config_ap(struct il_priv *il)
2934 /* RXON Timing */ 2934 /* RXON Timing */
2935 rc = il_send_rxon_timing(il, ctx); 2935 rc = il_send_rxon_timing(il, ctx);
2936 if (rc) 2936 if (rc)
2937 IL_WARN(il, "REPLY_RXON_TIMING failed - " 2937 IL_WARN("REPLY_RXON_TIMING failed - "
2938 "Attempting to continue.\n"); 2938 "Attempting to continue.\n");
2939 2939
2940 ctx->staging.assoc_id = 0; 2940 ctx->staging.assoc_id = 0;
@@ -3045,7 +3045,7 @@ static int il3945_mac_sta_add(struct ieee80211_hw *hw,
3045 &il->contexts[IL_RXON_CTX_BSS], 3045 &il->contexts[IL_RXON_CTX_BSS],
3046 sta->addr, is_ap, sta, &sta_id); 3046 sta->addr, is_ap, sta, &sta_id);
3047 if (ret) { 3047 if (ret) {
3048 IL_ERR(il, "Unable to add station %pM (%d)\n", 3048 IL_ERR("Unable to add station %pM (%d)\n",
3049 sta->addr, ret); 3049 sta->addr, ret);
3050 /* Should we return success if return code is EEXIST ? */ 3050 /* Should we return success if return code is EEXIST ? */
3051 mutex_unlock(&il->mutex); 3051 mutex_unlock(&il->mutex);
@@ -3147,11 +3147,11 @@ static ssize_t il3945_store_debug_level(struct device *d,
3147 3147
3148 ret = strict_strtoul(buf, 0, &val); 3148 ret = strict_strtoul(buf, 0, &val);
3149 if (ret) 3149 if (ret)
3150 IL_INFO(il, "%s is not in hex or decimal form.\n", buf); 3150 IL_INFO("%s is not in hex or decimal form.\n", buf);
3151 else { 3151 else {
3152 il->debug_level = val; 3152 il->debug_level = val;
3153 if (il_alloc_traffic_mem(il)) 3153 if (il_alloc_traffic_mem(il))
3154 IL_ERR(il, 3154 IL_ERR(
3155 "Not enough memory to generate traffic log\n"); 3155 "Not enough memory to generate traffic log\n");
3156 } 3156 }
3157 return strnlen(buf, count); 3157 return strnlen(buf, count);
@@ -3192,7 +3192,7 @@ static ssize_t il3945_store_tx_power(struct device *d,
3192 3192
3193 val = simple_strtoul(p, &p, 10); 3193 val = simple_strtoul(p, &p, 10);
3194 if (p == buf) 3194 if (p == buf)
3195 IL_INFO(il, ": %s is not in decimal form.\n", buf); 3195 IL_INFO(": %s is not in decimal form.\n", buf);
3196 else 3196 else
3197 il3945_hw_reg_set_txpower(il, val); 3197 il3945_hw_reg_set_txpower(il, val);
3198 3198
@@ -3222,7 +3222,7 @@ static ssize_t il3945_store_flags(struct device *d,
3222 if (le32_to_cpu(ctx->staging.flags) != flags) { 3222 if (le32_to_cpu(ctx->staging.flags) != flags) {
3223 /* Cancel any currently running scans... */ 3223 /* Cancel any currently running scans... */
3224 if (il_scan_cancel_timeout(il, 100)) 3224 if (il_scan_cancel_timeout(il, 100))
3225 IL_WARN(il, "Could not cancel scan.\n"); 3225 IL_WARN("Could not cancel scan.\n");
3226 else { 3226 else {
3227 D_INFO("Committing rxon.flags = 0x%04X\n", 3227 D_INFO("Committing rxon.flags = 0x%04X\n",
3228 flags); 3228 flags);
@@ -3259,7 +3259,7 @@ static ssize_t il3945_store_filter_flags(struct device *d,
3259 if (le32_to_cpu(ctx->staging.filter_flags) != filter_flags) { 3259 if (le32_to_cpu(ctx->staging.filter_flags) != filter_flags) {
3260 /* Cancel any currently running scans... */ 3260 /* Cancel any currently running scans... */
3261 if (il_scan_cancel_timeout(il, 100)) 3261 if (il_scan_cancel_timeout(il, 100))
3262 IL_WARN(il, "Could not cancel scan.\n"); 3262 IL_WARN("Could not cancel scan.\n");
3263 else { 3263 else {
3264 D_INFO("Committing rxon.filter_flags = " 3264 D_INFO("Committing rxon.filter_flags = "
3265 "0x%04X\n", filter_flags); 3265 "0x%04X\n", filter_flags);
@@ -3551,14 +3551,14 @@ static int il3945_init_drv(struct il_priv *il)
3551 il->force_reset.reset_duration = IL_DELAY_NEXT_FORCE_FW_RELOAD; 3551 il->force_reset.reset_duration = IL_DELAY_NEXT_FORCE_FW_RELOAD;
3552 3552
3553 if (eeprom->version < EEPROM_3945_EEPROM_VERSION) { 3553 if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
3554 IL_WARN(il, "Unsupported EEPROM version: 0x%04X\n", 3554 IL_WARN("Unsupported EEPROM version: 0x%04X\n",
3555 eeprom->version); 3555 eeprom->version);
3556 ret = -EINVAL; 3556 ret = -EINVAL;
3557 goto err; 3557 goto err;
3558 } 3558 }
3559 ret = il_init_channel_map(il); 3559 ret = il_init_channel_map(il);
3560 if (ret) { 3560 if (ret) {
3561 IL_ERR(il, "initializing regulatory failed: %d\n", ret); 3561 IL_ERR("initializing regulatory failed: %d\n", ret);
3562 goto err; 3562 goto err;
3563 } 3563 }
3564 3564
@@ -3570,7 +3570,7 @@ static int il3945_init_drv(struct il_priv *il)
3570 3570
3571 ret = il_init_geos(il); 3571 ret = il_init_geos(il);
3572 if (ret) { 3572 if (ret) {
3573 IL_ERR(il, "initializing geos failed: %d\n", ret); 3573 IL_ERR("initializing geos failed: %d\n", ret);
3574 goto err_free_channel_map; 3574 goto err_free_channel_map;
3575 } 3575 }
3576 il3945_init_hw_rates(il, il->ieee_rates); 3576 il3945_init_hw_rates(il, il->ieee_rates);
@@ -3624,7 +3624,7 @@ static int il3945_setup_mac(struct il_priv *il)
3624 3624
3625 ret = ieee80211_register_hw(il->hw); 3625 ret = ieee80211_register_hw(il->hw);
3626 if (ret) { 3626 if (ret) {
3627 IL_ERR(il, "Failed to register hw (error %d)\n", ret); 3627 IL_ERR("Failed to register hw (error %d)\n", ret);
3628 return ret; 3628 return ret;
3629 } 3629 }
3630 il->mac80211_registered = 1; 3630 il->mac80211_registered = 1;
@@ -3692,7 +3692,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3692 il->inta_mask = CSR_INI_SET_MASK; 3692 il->inta_mask = CSR_INI_SET_MASK;
3693 3693
3694 if (il_alloc_traffic_mem(il)) 3694 if (il_alloc_traffic_mem(il))
3695 IL_ERR(il, "Not enough memory to generate traffic log\n"); 3695 IL_ERR("Not enough memory to generate traffic log\n");
3696 3696
3697 /*************************** 3697 /***************************
3698 * 2. Initializing PCI bus 3698 * 2. Initializing PCI bus
@@ -3711,7 +3711,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3711 if (!err) 3711 if (!err)
3712 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); 3712 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
3713 if (err) { 3713 if (err) {
3714 IL_WARN(il, "No suitable DMA available.\n"); 3714 IL_WARN("No suitable DMA available.\n");
3715 goto out_pci_disable_device; 3715 goto out_pci_disable_device;
3716 } 3716 }
3717 3717
@@ -3757,7 +3757,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3757 /* Read the EEPROM */ 3757 /* Read the EEPROM */
3758 err = il_eeprom_init(il); 3758 err = il_eeprom_init(il);
3759 if (err) { 3759 if (err) {
3760 IL_ERR(il, "Unable to init EEPROM\n"); 3760 IL_ERR("Unable to init EEPROM\n");
3761 goto out_iounmap; 3761 goto out_iounmap;
3762 } 3762 }
3763 /* MAC Address location in EEPROM same for 3945/4965 */ 3763 /* MAC Address location in EEPROM same for 3945/4965 */
@@ -3770,7 +3770,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3770 * ********************/ 3770 * ********************/
3771 /* Device-specific setup */ 3771 /* Device-specific setup */
3772 if (il3945_hw_set_hw_params(il)) { 3772 if (il3945_hw_set_hw_params(il)) {
3773 IL_ERR(il, "failed to set hw settings\n"); 3773 IL_ERR("failed to set hw settings\n");
3774 goto out_eeprom_free; 3774 goto out_eeprom_free;
3775 } 3775 }
3776 3776
@@ -3780,11 +3780,11 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3780 3780
3781 err = il3945_init_drv(il); 3781 err = il3945_init_drv(il);
3782 if (err) { 3782 if (err) {
3783 IL_ERR(il, "initializing driver failed\n"); 3783 IL_ERR("initializing driver failed\n");
3784 goto out_unset_hw_params; 3784 goto out_unset_hw_params;
3785 } 3785 }
3786 3786
3787 IL_INFO(il, "Detected Intel Wireless WiFi Link %s\n", 3787 IL_INFO("Detected Intel Wireless WiFi Link %s\n",
3788 il->cfg->name); 3788 il->cfg->name);
3789 3789
3790 /*********************** 3790 /***********************
@@ -3800,13 +3800,13 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3800 err = request_irq(il->pci_dev->irq, il_isr, 3800 err = request_irq(il->pci_dev->irq, il_isr,
3801 IRQF_SHARED, DRV_NAME, il); 3801 IRQF_SHARED, DRV_NAME, il);
3802 if (err) { 3802 if (err) {
3803 IL_ERR(il, "Error allocating IRQ %d\n", il->pci_dev->irq); 3803 IL_ERR("Error allocating IRQ %d\n", il->pci_dev->irq);
3804 goto out_disable_msi; 3804 goto out_disable_msi;
3805 } 3805 }
3806 3806
3807 err = sysfs_create_group(&pdev->dev.kobj, &il3945_attribute_group); 3807 err = sysfs_create_group(&pdev->dev.kobj, &il3945_attribute_group);
3808 if (err) { 3808 if (err) {
3809 IL_ERR(il, "failed to create sysfs device attributes\n"); 3809 IL_ERR("failed to create sysfs device attributes\n");
3810 goto out_release_irq; 3810 goto out_release_irq;
3811 } 3811 }
3812 3812
@@ -3829,7 +3829,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
3829 3829
3830 err = il_dbgfs_register(il, DRV_NAME); 3830 err = il_dbgfs_register(il, DRV_NAME);
3831 if (err) 3831 if (err)
3832 IL_ERR(il, "failed to create debugfs files. Ignoring error: %d\n", err); 3832 IL_ERR("failed to create debugfs files. Ignoring error: %d\n", err);
3833 3833
3834 /* Start monitoring the killswitch */ 3834 /* Start monitoring the killswitch */
3835 queue_delayed_work(il->workqueue, &il->_3945.rfkill_poll, 3835 queue_delayed_work(il->workqueue, &il->_3945.rfkill_poll,
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 88dc8db3d661..df7e0a484dfe 100644
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -115,7 +115,7 @@ static void il4965_clear_free_frames(struct il_priv *il)
115 } 115 }
116 116
117 if (il->frames_count) { 117 if (il->frames_count) {
118 IL_WARN(il, "%d frames still in use. Did we lose one?\n", 118 IL_WARN("%d frames still in use. Did we lose one?\n",
119 il->frames_count); 119 il->frames_count);
120 il->frames_count = 0; 120 il->frames_count = 0;
121 } 121 }
@@ -128,7 +128,7 @@ static struct il_frame *il4965_get_free_frame(struct il_priv *il)
128 if (list_empty(&il->free_frames)) { 128 if (list_empty(&il->free_frames)) {
129 frame = kzalloc(sizeof(*frame), GFP_KERNEL); 129 frame = kzalloc(sizeof(*frame), GFP_KERNEL);
130 if (!frame) { 130 if (!frame) {
131 IL_ERR(il, "Could not allocate frame!\n"); 131 IL_ERR("Could not allocate frame!\n");
132 return NULL; 132 return NULL;
133 } 133 }
134 134
@@ -188,7 +188,7 @@ static void il4965_set_beacon_tim(struct il_priv *il,
188 tx_beacon_cmd->tim_idx = cpu_to_le16(tim_idx); 188 tx_beacon_cmd->tim_idx = cpu_to_le16(tim_idx);
189 tx_beacon_cmd->tim_size = beacon[tim_idx+1]; 189 tx_beacon_cmd->tim_size = beacon[tim_idx+1];
190 } else 190 } else
191 IL_WARN(il, "Unable to find TIM Element in beacon\n"); 191 IL_WARN("Unable to find TIM Element in beacon\n");
192} 192}
193 193
194static unsigned int il4965_hw_get_beacon_cmd(struct il_priv *il, 194static unsigned int il4965_hw_get_beacon_cmd(struct il_priv *il,
@@ -206,7 +206,7 @@ static unsigned int il4965_hw_get_beacon_cmd(struct il_priv *il,
206 lockdep_assert_held(&il->mutex); 206 lockdep_assert_held(&il->mutex);
207 207
208 if (!il->beacon_ctx) { 208 if (!il->beacon_ctx) {
209 IL_ERR(il, "trying to build beacon w/o beacon context!\n"); 209 IL_ERR("trying to build beacon w/o beacon context!\n");
210 return 0; 210 return 0;
211 } 211 }
212 212
@@ -254,14 +254,14 @@ int il4965_send_beacon_cmd(struct il_priv *il)
254 254
255 frame = il4965_get_free_frame(il); 255 frame = il4965_get_free_frame(il);
256 if (!frame) { 256 if (!frame) {
257 IL_ERR(il, "Could not obtain free frame buffer for beacon " 257 IL_ERR("Could not obtain free frame buffer for beacon "
258 "command.\n"); 258 "command.\n");
259 return -ENOMEM; 259 return -ENOMEM;
260 } 260 }
261 261
262 frame_size = il4965_hw_get_beacon_cmd(il, frame); 262 frame_size = il4965_hw_get_beacon_cmd(il, frame);
263 if (!frame_size) { 263 if (!frame_size) {
264 IL_ERR(il, "Error configuring the beacon command\n"); 264 IL_ERR("Error configuring the beacon command\n");
265 il4965_free_frame(il, frame); 265 il4965_free_frame(il, frame);
266 return -EINVAL; 266 return -EINVAL;
267 } 267 }
@@ -336,7 +336,7 @@ void il4965_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)
336 num_tbs = il4965_tfd_get_num_tbs(tfd); 336 num_tbs = il4965_tfd_get_num_tbs(tfd);
337 337
338 if (num_tbs >= IL_NUM_OF_TBS) { 338 if (num_tbs >= IL_NUM_OF_TBS) {
339 IL_ERR(il, "Too many chunks: %i\n", num_tbs); 339 IL_ERR("Too many chunks: %i\n", num_tbs);
340 /* @todo issue fatal error, it is quite serious situation */ 340 /* @todo issue fatal error, it is quite serious situation */
341 return; 341 return;
342 } 342 }
@@ -388,14 +388,14 @@ int il4965_hw_txq_attach_buf_to_tfd(struct il_priv *il,
388 388
389 /* Each TFD can point to a maximum 20 Tx buffers */ 389 /* Each TFD can point to a maximum 20 Tx buffers */
390 if (num_tbs >= IL_NUM_OF_TBS) { 390 if (num_tbs >= IL_NUM_OF_TBS) {
391 IL_ERR(il, "Error can not send more than %d chunks\n", 391 IL_ERR("Error can not send more than %d chunks\n",
392 IL_NUM_OF_TBS); 392 IL_NUM_OF_TBS);
393 return -EINVAL; 393 return -EINVAL;
394 } 394 }
395 395
396 BUG_ON(addr & ~DMA_BIT_MASK(36)); 396 BUG_ON(addr & ~DMA_BIT_MASK(36));
397 if (unlikely(addr & ~IL_TX_DMA_MASK)) 397 if (unlikely(addr & ~IL_TX_DMA_MASK))
398 IL_ERR(il, "Unaligned address = %llx\n", 398 IL_ERR("Unaligned address = %llx\n",
399 (unsigned long long)addr); 399 (unsigned long long)addr);
400 400
401 il4965_tfd_set_tb(tfd, num_tbs, addr, len); 401 il4965_tfd_set_tb(tfd, num_tbs, addr, len);
@@ -460,7 +460,7 @@ static void il4965_rx_reply_alive(struct il_priv *il,
460 queue_delayed_work(il->workqueue, pwork, 460 queue_delayed_work(il->workqueue, pwork,
461 msecs_to_jiffies(5)); 461 msecs_to_jiffies(5));
462 else 462 else
463 IL_WARN(il, "uCode did not respond OK.\n"); 463 IL_WARN("uCode did not respond OK.\n");
464} 464}
465 465
466/** 466/**
@@ -725,7 +725,7 @@ void il4965_rx_handle(struct il_priv *il)
725 if (rxb->page) 725 if (rxb->page)
726 il_tx_cmd_complete(il, rxb); 726 il_tx_cmd_complete(il, rxb);
727 else 727 else
728 IL_WARN(il, "Claim null rxb?\n"); 728 IL_WARN("Claim null rxb?\n");
729 } 729 }
730 730
731 /* Reuse the page if possible. For notification packets and 731 /* Reuse the page if possible. For notification packets and
@@ -818,7 +818,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
818 818
819 /* Now service all interrupt bits discovered above. */ 819 /* Now service all interrupt bits discovered above. */
820 if (inta & CSR_INT_BIT_HW_ERR) { 820 if (inta & CSR_INT_BIT_HW_ERR) {
821 IL_ERR(il, "Hardware error detected. Restarting.\n"); 821 IL_ERR("Hardware error detected. Restarting.\n");
822 822
823 /* Tell the device to stop sending interrupts */ 823 /* Tell the device to stop sending interrupts */
824 il_disable_interrupts(il); 824 il_disable_interrupts(il);
@@ -857,7 +857,7 @@ static void il4965_irq_tasklet(struct il_priv *il)
857 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)) 857 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
858 hw_rf_kill = 1; 858 hw_rf_kill = 1;
859 859
860 IL_WARN(il, "RF_KILL bit toggled to %s.\n", 860 IL_WARN("RF_KILL bit toggled to %s.\n",
861 hw_rf_kill ? "disable radio" : "enable radio"); 861 hw_rf_kill ? "disable radio" : "enable radio");
862 862
863 il->isr_stats.rfkill++; 863 il->isr_stats.rfkill++;
@@ -880,14 +880,14 @@ static void il4965_irq_tasklet(struct il_priv *il)
880 880
881 /* Chip got too hot and stopped itself */ 881 /* Chip got too hot and stopped itself */
882 if (inta & CSR_INT_BIT_CT_KILL) { 882 if (inta & CSR_INT_BIT_CT_KILL) {
883 IL_ERR(il, "Microcode CT kill error detected.\n"); 883 IL_ERR("Microcode CT kill error detected.\n");
884 il->isr_stats.ctkill++; 884 il->isr_stats.ctkill++;
885 handled |= CSR_INT_BIT_CT_KILL; 885 handled |= CSR_INT_BIT_CT_KILL;
886 } 886 }
887 887
888 /* Error detected by uCode */ 888 /* Error detected by uCode */
889 if (inta & CSR_INT_BIT_SW_ERR) { 889 if (inta & CSR_INT_BIT_SW_ERR) {
890 IL_ERR(il, "Microcode SW error detected. " 890 IL_ERR("Microcode SW error detected. "
891 " Restarting 0x%X.\n", inta); 891 " Restarting 0x%X.\n", inta);
892 il->isr_stats.sw++; 892 il->isr_stats.sw++;
893 il_irq_handle_error(il); 893 il_irq_handle_error(il);
@@ -928,14 +928,14 @@ static void il4965_irq_tasklet(struct il_priv *il)
928 } 928 }
929 929
930 if (inta & ~handled) { 930 if (inta & ~handled) {
931 IL_ERR(il, "Unhandled INTA bits 0x%08x\n", inta & ~handled); 931 IL_ERR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
932 il->isr_stats.unhandled++; 932 il->isr_stats.unhandled++;
933 } 933 }
934 934
935 if (inta & ~(il->inta_mask)) { 935 if (inta & ~(il->inta_mask)) {
936 IL_WARN(il, "Disabled INTA bits 0x%08x were pending\n", 936 IL_WARN("Disabled INTA bits 0x%08x were pending\n",
937 inta & ~il->inta_mask); 937 inta & ~il->inta_mask);
938 IL_WARN(il, " with FH_INT = 0x%08x\n", inta_fh); 938 IL_WARN(" with FH_INT = 0x%08x\n", inta_fh);
939 } 939 }
940 940
941 /* Re-enable all interrupts */ 941 /* Re-enable all interrupts */
@@ -993,11 +993,11 @@ static ssize_t il4965_store_debug_level(struct device *d,
993 993
994 ret = strict_strtoul(buf, 0, &val); 994 ret = strict_strtoul(buf, 0, &val);
995 if (ret) 995 if (ret)
996 IL_ERR(il, "%s is not in hex or decimal form.\n", buf); 996 IL_ERR("%s is not in hex or decimal form.\n", buf);
997 else { 997 else {
998 il->debug_level = val; 998 il->debug_level = val;
999 if (il_alloc_traffic_mem(il)) 999 if (il_alloc_traffic_mem(il))
1000 IL_ERR(il, 1000 IL_ERR(
1001 "Not enough memory to generate traffic log\n"); 1001 "Not enough memory to generate traffic log\n");
1002 } 1002 }
1003 return strnlen(buf, count); 1003 return strnlen(buf, count);
@@ -1044,11 +1044,11 @@ static ssize_t il4965_store_tx_power(struct device *d,
1044 1044
1045 ret = strict_strtoul(buf, 10, &val); 1045 ret = strict_strtoul(buf, 10, &val);
1046 if (ret) 1046 if (ret)
1047 IL_INFO(il, "%s is not in decimal form.\n", buf); 1047 IL_INFO("%s is not in decimal form.\n", buf);
1048 else { 1048 else {
1049 ret = il_set_tx_power(il, val, false); 1049 ret = il_set_tx_power(il, val, false);
1050 if (ret) 1050 if (ret)
1051 IL_ERR(il, "failed setting tx power (0x%d).\n", 1051 IL_ERR("failed setting tx power (0x%d).\n",
1052 ret); 1052 ret);
1053 else 1053 else
1054 ret = count; 1054 ret = count;
@@ -1114,7 +1114,7 @@ static int __must_check il4965_request_firmware(struct il_priv *il, bool first)
1114 } 1114 }
1115 1115
1116 if (il->fw_index < il->cfg->ucode_api_min) { 1116 if (il->fw_index < il->cfg->ucode_api_min) {
1117 IL_ERR(il, "no suitable firmware found!\n"); 1117 IL_ERR("no suitable firmware found!\n");
1118 return -ENOENT; 1118 return -ENOENT;
1119 } 1119 }
1120 1120
@@ -1151,7 +1151,7 @@ static int il4965_load_firmware(struct il_priv *il,
1151 case 2: 1151 case 2:
1152 hdr_size = 24; 1152 hdr_size = 24;
1153 if (ucode_raw->size < hdr_size) { 1153 if (ucode_raw->size < hdr_size) {
1154 IL_ERR(il, "File size too small!\n"); 1154 IL_ERR("File size too small!\n");
1155 return -EINVAL; 1155 return -EINVAL;
1156 } 1156 }
1157 pieces->inst_size = le32_to_cpu(ucode->v1.inst_size); 1157 pieces->inst_size = le32_to_cpu(ucode->v1.inst_size);
@@ -1169,7 +1169,7 @@ static int il4965_load_firmware(struct il_priv *il,
1169 pieces->data_size + pieces->init_size + 1169 pieces->data_size + pieces->init_size +
1170 pieces->init_data_size + pieces->boot_size) { 1170 pieces->init_data_size + pieces->boot_size) {
1171 1171
1172 IL_ERR(il, 1172 IL_ERR(
1173 "uCode file size %d does not match expected size\n", 1173 "uCode file size %d does not match expected size\n",
1174 (int)ucode_raw->size); 1174 (int)ucode_raw->size);
1175 return -EINVAL; 1175 return -EINVAL;
@@ -1214,7 +1214,7 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1214 1214
1215 if (!ucode_raw) { 1215 if (!ucode_raw) {
1216 if (il->fw_index <= il->cfg->ucode_api_max) 1216 if (il->fw_index <= il->cfg->ucode_api_max)
1217 IL_ERR(il, 1217 IL_ERR(
1218 "request for firmware file '%s' failed.\n", 1218 "request for firmware file '%s' failed.\n",
1219 il->firmware_name); 1219 il->firmware_name);
1220 goto try_again; 1220 goto try_again;
@@ -1225,7 +1225,7 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1225 1225
1226 /* Make sure that we got at least the API version number */ 1226 /* Make sure that we got at least the API version number */
1227 if (ucode_raw->size < 4) { 1227 if (ucode_raw->size < 4) {
1228 IL_ERR(il, "File size way too small!\n"); 1228 IL_ERR("File size way too small!\n");
1229 goto try_again; 1229 goto try_again;
1230 } 1230 }
1231 1231
@@ -1245,7 +1245,7 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1245 * on the API version read from firmware header from here on forward 1245 * on the API version read from firmware header from here on forward
1246 */ 1246 */
1247 if (api_ver < api_min || api_ver > api_max) { 1247 if (api_ver < api_min || api_ver > api_max) {
1248 IL_ERR(il, 1248 IL_ERR(
1249 "Driver unable to support your firmware API. " 1249 "Driver unable to support your firmware API. "
1250 "Driver supports v%u, firmware is v%u.\n", 1250 "Driver supports v%u, firmware is v%u.\n",
1251 api_max, api_ver); 1251 api_max, api_ver);
@@ -1253,13 +1253,13 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1253 } 1253 }
1254 1254
1255 if (api_ver != api_max) 1255 if (api_ver != api_max)
1256 IL_ERR(il, 1256 IL_ERR(
1257 "Firmware has old API version. Expected v%u, " 1257 "Firmware has old API version. Expected v%u, "
1258 "got v%u. New firmware can be obtained " 1258 "got v%u. New firmware can be obtained "
1259 "from http://www.intellinuxwireless.org.\n", 1259 "from http://www.intellinuxwireless.org.\n",
1260 api_max, api_ver); 1260 api_max, api_ver);
1261 1261
1262 IL_INFO(il, "loaded firmware version %u.%u.%u.%u\n", 1262 IL_INFO("loaded firmware version %u.%u.%u.%u\n",
1263 IL_UCODE_MAJOR(il->ucode_ver), 1263 IL_UCODE_MAJOR(il->ucode_ver),
1264 IL_UCODE_MINOR(il->ucode_ver), 1264 IL_UCODE_MINOR(il->ucode_ver),
1265 IL_UCODE_API(il->ucode_ver), 1265 IL_UCODE_API(il->ucode_ver),
@@ -1294,31 +1294,31 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1294 1294
1295 /* Verify that uCode images will fit in card's SRAM */ 1295 /* Verify that uCode images will fit in card's SRAM */
1296 if (pieces.inst_size > il->hw_params.max_inst_size) { 1296 if (pieces.inst_size > il->hw_params.max_inst_size) {
1297 IL_ERR(il, "uCode instr len %Zd too large to fit in\n", 1297 IL_ERR("uCode instr len %Zd too large to fit in\n",
1298 pieces.inst_size); 1298 pieces.inst_size);
1299 goto try_again; 1299 goto try_again;
1300 } 1300 }
1301 1301
1302 if (pieces.data_size > il->hw_params.max_data_size) { 1302 if (pieces.data_size > il->hw_params.max_data_size) {
1303 IL_ERR(il, "uCode data len %Zd too large to fit in\n", 1303 IL_ERR("uCode data len %Zd too large to fit in\n",
1304 pieces.data_size); 1304 pieces.data_size);
1305 goto try_again; 1305 goto try_again;
1306 } 1306 }
1307 1307
1308 if (pieces.init_size > il->hw_params.max_inst_size) { 1308 if (pieces.init_size > il->hw_params.max_inst_size) {
1309 IL_ERR(il, "uCode init instr len %Zd too large to fit in\n", 1309 IL_ERR("uCode init instr len %Zd too large to fit in\n",
1310 pieces.init_size); 1310 pieces.init_size);
1311 goto try_again; 1311 goto try_again;
1312 } 1312 }
1313 1313
1314 if (pieces.init_data_size > il->hw_params.max_data_size) { 1314 if (pieces.init_data_size > il->hw_params.max_data_size) {
1315 IL_ERR(il, "uCode init data len %Zd too large to fit in\n", 1315 IL_ERR("uCode init data len %Zd too large to fit in\n",
1316 pieces.init_data_size); 1316 pieces.init_data_size);
1317 goto try_again; 1317 goto try_again;
1318 } 1318 }
1319 1319
1320 if (pieces.boot_size > il->hw_params.max_bsm_size) { 1320 if (pieces.boot_size > il->hw_params.max_bsm_size) {
1321 IL_ERR(il, "uCode boot instr len %Zd too large to fit in\n", 1321 IL_ERR("uCode boot instr len %Zd too large to fit in\n",
1322 pieces.boot_size); 1322 pieces.boot_size);
1323 goto try_again; 1323 goto try_again;
1324 } 1324 }
@@ -1427,13 +1427,13 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1427 1427
1428 err = il_dbgfs_register(il, DRV_NAME); 1428 err = il_dbgfs_register(il, DRV_NAME);
1429 if (err) 1429 if (err)
1430 IL_ERR(il, 1430 IL_ERR(
1431 "failed to create debugfs files. Ignoring error: %d\n", err); 1431 "failed to create debugfs files. Ignoring error: %d\n", err);
1432 1432
1433 err = sysfs_create_group(&il->pci_dev->dev.kobj, 1433 err = sysfs_create_group(&il->pci_dev->dev.kobj,
1434 &il_attribute_group); 1434 &il_attribute_group);
1435 if (err) { 1435 if (err) {
1436 IL_ERR(il, "failed to create sysfs device attributes\n"); 1436 IL_ERR("failed to create sysfs device attributes\n");
1437 goto out_unbind; 1437 goto out_unbind;
1438 } 1438 }
1439 1439
@@ -1450,7 +1450,7 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
1450 return; 1450 return;
1451 1451
1452 err_pci_alloc: 1452 err_pci_alloc:
1453 IL_ERR(il, "failed to allocate pci memory\n"); 1453 IL_ERR("failed to allocate pci memory\n");
1454 il4965_dealloc_ucode_pci(il); 1454 il4965_dealloc_ucode_pci(il);
1455 out_unbind: 1455 out_unbind:
1456 complete(&il->_4965.firmware_loading_complete); 1456 complete(&il->_4965.firmware_loading_complete);
@@ -1541,7 +1541,7 @@ void il4965_dump_nic_error_log(struct il_priv *il)
1541 } 1541 }
1542 1542
1543 if (!il->cfg->ops->lib->is_valid_rtc_data_addr(base)) { 1543 if (!il->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
1544 IL_ERR(il, 1544 IL_ERR(
1545 "Not valid error log pointer 0x%08X for %s uCode\n", 1545 "Not valid error log pointer 0x%08X for %s uCode\n",
1546 base, (il->ucode_type == UCODE_INIT) ? "Init" : "RT"); 1546 base, (il->ucode_type == UCODE_INIT) ? "Init" : "RT");
1547 return; 1547 return;
@@ -1550,8 +1550,8 @@ void il4965_dump_nic_error_log(struct il_priv *il)
1550 count = il_read_targ_mem(il, base); 1550 count = il_read_targ_mem(il, base);
1551 1551
1552 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { 1552 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
1553 IL_ERR(il, "Start IWL Error Log Dump:\n"); 1553 IL_ERR("Start IWL Error Log Dump:\n");
1554 IL_ERR(il, "Status: 0x%08lX, count: %d\n", 1554 IL_ERR("Status: 0x%08lX, count: %d\n",
1555 il->status, count); 1555 il->status, count);
1556 } 1556 }
1557 1557
@@ -1568,12 +1568,12 @@ void il4965_dump_nic_error_log(struct il_priv *il)
1568 time = il_read_targ_mem(il, base + 11 * sizeof(u32)); 1568 time = il_read_targ_mem(il, base + 11 * sizeof(u32));
1569 hcmd = il_read_targ_mem(il, base + 22 * sizeof(u32)); 1569 hcmd = il_read_targ_mem(il, base + 22 * sizeof(u32));
1570 1570
1571 IL_ERR(il, "Desc Time " 1571 IL_ERR("Desc Time "
1572 "data1 data2 line\n"); 1572 "data1 data2 line\n");
1573 IL_ERR(il, "%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n", 1573 IL_ERR("%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n",
1574 il4965_desc_lookup(desc), desc, time, data1, data2, line); 1574 il4965_desc_lookup(desc), desc, time, data1, data2, line);
1575 IL_ERR(il, "pc blink1 blink2 ilink1 ilink2 hcmd\n"); 1575 IL_ERR("pc blink1 blink2 ilink1 ilink2 hcmd\n");
1576 IL_ERR(il, "0x%05X 0x%05X 0x%05X 0x%05X 0x%05X 0x%05X\n", 1576 IL_ERR("0x%05X 0x%05X 0x%05X 0x%05X 0x%05X 0x%05X\n",
1577 pc, blink1, blink2, ilink1, ilink2, hcmd); 1577 pc, blink1, blink2, ilink1, ilink2, hcmd);
1578} 1578}
1579 1579
@@ -1594,7 +1594,7 @@ static void il4965_rf_kill_ct_config(struct il_priv *il)
1594 ret = il_send_cmd_pdu(il, REPLY_CT_KILL_CONFIG_CMD, 1594 ret = il_send_cmd_pdu(il, REPLY_CT_KILL_CONFIG_CMD,
1595 sizeof(cmd), &cmd); 1595 sizeof(cmd), &cmd);
1596 if (ret) 1596 if (ret)
1597 IL_ERR(il, "REPLY_CT_KILL_CONFIG_CMD failed\n"); 1597 IL_ERR("REPLY_CT_KILL_CONFIG_CMD failed\n");
1598 else 1598 else
1599 D_INFO("REPLY_CT_KILL_CONFIG_CMD " 1599 D_INFO("REPLY_CT_KILL_CONFIG_CMD "
1600 "succeeded, " 1600 "succeeded, "
@@ -1740,7 +1740,7 @@ static void il4965_alive_start(struct il_priv *il)
1740 1740
1741 ret = il4965_alive_notify(il); 1741 ret = il4965_alive_notify(il);
1742 if (ret) { 1742 if (ret) {
1743 IL_WARN(il, 1743 IL_WARN(
1744 "Could not complete ALIVE transition [ntf]: %d\n", ret); 1744 "Could not complete ALIVE transition [ntf]: %d\n", ret);
1745 goto restart; 1745 goto restart;
1746 } 1746 }
@@ -1955,12 +1955,12 @@ static int __il4965_up(struct il_priv *il)
1955 int ret; 1955 int ret;
1956 1956
1957 if (test_bit(STATUS_EXIT_PENDING, &il->status)) { 1957 if (test_bit(STATUS_EXIT_PENDING, &il->status)) {
1958 IL_WARN(il, "Exit pending; will not bring the NIC up\n"); 1958 IL_WARN("Exit pending; will not bring the NIC up\n");
1959 return -EIO; 1959 return -EIO;
1960 } 1960 }
1961 1961
1962 if (!il->ucode_data_backup.v_addr || !il->ucode_data.v_addr) { 1962 if (!il->ucode_data_backup.v_addr || !il->ucode_data.v_addr) {
1963 IL_ERR(il, "ucode not available for device bringup\n"); 1963 IL_ERR("ucode not available for device bringup\n");
1964 return -EIO; 1964 return -EIO;
1965 } 1965 }
1966 1966
@@ -1975,7 +1975,7 @@ static int __il4965_up(struct il_priv *il)
1975 il4965_prepare_card_hw(il); 1975 il4965_prepare_card_hw(il);
1976 1976
1977 if (!il->hw_ready) { 1977 if (!il->hw_ready) {
1978 IL_WARN(il, "Exit HW not ready\n"); 1978 IL_WARN("Exit HW not ready\n");
1979 return -EIO; 1979 return -EIO;
1980 } 1980 }
1981 1981
@@ -1990,7 +1990,7 @@ static int __il4965_up(struct il_priv *il)
1990 wiphy_rfkill_set_hw_state(il->hw->wiphy, true); 1990 wiphy_rfkill_set_hw_state(il->hw->wiphy, true);
1991 1991
1992 il_enable_interrupts(il); 1992 il_enable_interrupts(il);
1993 IL_WARN(il, "Radio disabled by HW RF Kill switch\n"); 1993 IL_WARN("Radio disabled by HW RF Kill switch\n");
1994 return 0; 1994 return 0;
1995 } 1995 }
1996 1996
@@ -2001,7 +2001,7 @@ static int __il4965_up(struct il_priv *il)
2001 2001
2002 ret = il4965_hw_nic_init(il); 2002 ret = il4965_hw_nic_init(il);
2003 if (ret) { 2003 if (ret) {
2004 IL_ERR(il, "Unable to init nic\n"); 2004 IL_ERR("Unable to init nic\n");
2005 return ret; 2005 return ret;
2006 } 2006 }
2007 2007
@@ -2032,7 +2032,7 @@ static int __il4965_up(struct il_priv *il)
2032 ret = il->cfg->ops->lib->load_ucode(il); 2032 ret = il->cfg->ops->lib->load_ucode(il);
2033 2033
2034 if (ret) { 2034 if (ret) {
2035 IL_ERR(il, "Unable to set up bootstrap uCode: %d\n", 2035 IL_ERR("Unable to set up bootstrap uCode: %d\n",
2036 ret); 2036 ret);
2037 continue; 2037 continue;
2038 } 2038 }
@@ -2051,7 +2051,7 @@ static int __il4965_up(struct il_priv *il)
2051 2051
2052 /* tried to restart and config the device for as long as our 2052 /* tried to restart and config the device for as long as our
2053 * patience could withstand */ 2053 * patience could withstand */
2054 IL_ERR(il, "Unable to initialize device after %d attempts.\n", i); 2054 IL_ERR("Unable to initialize device after %d attempts.\n", i);
2055 return -EIO; 2055 return -EIO;
2056} 2056}
2057 2057
@@ -2229,7 +2229,7 @@ static int il4965_mac_setup_register(struct il_priv *il,
2229 2229
2230 ret = ieee80211_register_hw(il->hw); 2230 ret = ieee80211_register_hw(il->hw);
2231 if (ret) { 2231 if (ret) {
2232 IL_ERR(il, "Failed to register hw (error %d)\n", ret); 2232 IL_ERR("Failed to register hw (error %d)\n", ret);
2233 return ret; 2233 return ret;
2234 } 2234 }
2235 il->mac80211_registered = 1; 2235 il->mac80211_registered = 1;
@@ -2265,7 +2265,7 @@ int il4965_mac_start(struct ieee80211_hw *hw)
2265 UCODE_READY_TIMEOUT); 2265 UCODE_READY_TIMEOUT);
2266 if (!ret) { 2266 if (!ret) {
2267 if (!test_bit(STATUS_READY, &il->status)) { 2267 if (!test_bit(STATUS_READY, &il->status)) {
2268 IL_ERR(il, "START_ALIVE timeout after %dms.\n", 2268 IL_ERR("START_ALIVE timeout after %dms.\n",
2269 jiffies_to_msecs(UCODE_READY_TIMEOUT)); 2269 jiffies_to_msecs(UCODE_READY_TIMEOUT));
2270 return -ETIMEDOUT; 2270 return -ETIMEDOUT;
2271 } 2271 }
@@ -2475,7 +2475,7 @@ int il4965_mac_sta_add(struct ieee80211_hw *hw,
2475 ret = il_add_station_common(il, vif_priv->ctx, sta->addr, 2475 ret = il_add_station_common(il, vif_priv->ctx, sta->addr,
2476 is_ap, sta, &sta_id); 2476 is_ap, sta, &sta_id);
2477 if (ret) { 2477 if (ret) {
2478 IL_ERR(il, "Unable to add station %pM (%d)\n", 2478 IL_ERR("Unable to add station %pM (%d)\n",
2479 sta->addr, ret); 2479 sta->addr, ret);
2480 /* Should we return success if return code is EEXIST ? */ 2480 /* Should we return success if return code is EEXIST ? */
2481 mutex_unlock(&il->mutex); 2481 mutex_unlock(&il->mutex);
@@ -2792,13 +2792,13 @@ static int il4965_init_drv(struct il_priv *il)
2792 2792
2793 ret = il_init_channel_map(il); 2793 ret = il_init_channel_map(il);
2794 if (ret) { 2794 if (ret) {
2795 IL_ERR(il, "initializing regulatory failed: %d\n", ret); 2795 IL_ERR("initializing regulatory failed: %d\n", ret);
2796 goto err; 2796 goto err;
2797 } 2797 }
2798 2798
2799 ret = il_init_geos(il); 2799 ret = il_init_geos(il);
2800 if (ret) { 2800 if (ret) {
2801 IL_ERR(il, "initializing geos failed: %d\n", ret); 2801 IL_ERR("initializing geos failed: %d\n", ret);
2802 goto err_free_channel_map; 2802 goto err_free_channel_map;
2803 } 2803 }
2804 il4965_init_hw_rates(il, il->ieee_rates); 2804 il4965_init_hw_rates(il, il->ieee_rates);
@@ -2917,7 +2917,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2917 il->inta_mask = CSR_INI_SET_MASK; 2917 il->inta_mask = CSR_INI_SET_MASK;
2918 2918
2919 if (il_alloc_traffic_mem(il)) 2919 if (il_alloc_traffic_mem(il))
2920 IL_ERR(il, "Not enough memory to generate traffic log\n"); 2920 IL_ERR("Not enough memory to generate traffic log\n");
2921 2921
2922 /************************** 2922 /**************************
2923 * 2. Initializing PCI bus 2923 * 2. Initializing PCI bus
@@ -2942,7 +2942,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2942 DMA_BIT_MASK(32)); 2942 DMA_BIT_MASK(32));
2943 /* both attempts failed: */ 2943 /* both attempts failed: */
2944 if (err) { 2944 if (err) {
2945 IL_WARN(il, "No suitable DMA available.\n"); 2945 IL_WARN("No suitable DMA available.\n");
2946 goto out_pci_disable_device; 2946 goto out_pci_disable_device;
2947 } 2947 }
2948 } 2948 }
@@ -2981,7 +2981,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2981 il_write32(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET); 2981 il_write32(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
2982 2982
2983 il4965_hw_detect(il); 2983 il4965_hw_detect(il);
2984 IL_INFO(il, "Detected %s, REV=0x%X\n", 2984 IL_INFO("Detected %s, REV=0x%X\n",
2985 il->cfg->name, il->hw_rev); 2985 il->cfg->name, il->hw_rev);
2986 2986
2987 /* We disable the RETRY_TIMEOUT register (0x41) to keep 2987 /* We disable the RETRY_TIMEOUT register (0x41) to keep
@@ -2990,7 +2990,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2990 2990
2991 il4965_prepare_card_hw(il); 2991 il4965_prepare_card_hw(il);
2992 if (!il->hw_ready) { 2992 if (!il->hw_ready) {
2993 IL_WARN(il, "Failed, HW not ready\n"); 2993 IL_WARN("Failed, HW not ready\n");
2994 goto out_iounmap; 2994 goto out_iounmap;
2995 } 2995 }
2996 2996
@@ -3000,7 +3000,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3000 /* Read the EEPROM */ 3000 /* Read the EEPROM */
3001 err = il_eeprom_init(il); 3001 err = il_eeprom_init(il);
3002 if (err) { 3002 if (err) {
3003 IL_ERR(il, "Unable to init EEPROM\n"); 3003 IL_ERR("Unable to init EEPROM\n");
3004 goto out_iounmap; 3004 goto out_iounmap;
3005 } 3005 }
3006 err = il4965_eeprom_check_version(il); 3006 err = il4965_eeprom_check_version(il);
@@ -3020,7 +3020,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3020 * 5. Setup HW constants 3020 * 5. Setup HW constants
3021 ************************/ 3021 ************************/
3022 if (il4965_set_hw_params(il)) { 3022 if (il4965_set_hw_params(il)) {
3023 IL_ERR(il, "failed to set hw parameters\n"); 3023 IL_ERR("failed to set hw parameters\n");
3024 goto out_free_eeprom; 3024 goto out_free_eeprom;
3025 } 3025 }
3026 3026
@@ -3045,7 +3045,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3045 err = request_irq(il->pci_dev->irq, il_isr, 3045 err = request_irq(il->pci_dev->irq, il_isr,
3046 IRQF_SHARED, DRV_NAME, il); 3046 IRQF_SHARED, DRV_NAME, il);
3047 if (err) { 3047 if (err) {
3048 IL_ERR(il, "Error allocating IRQ %d\n", il->pci_dev->irq); 3048 IL_ERR("Error allocating IRQ %d\n", il->pci_dev->irq);
3049 goto out_disable_msi; 3049 goto out_disable_msi;
3050 } 3050 }
3051 3051
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-12 09:30:18 -0400