Commit 39aadf8c authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: replace IWL_WARNING with IWL_WARN 



IWL_WARN doesn't use hidden priv pointer.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 978785a3

drivers/net/wireless/iwlwifi/iwl-3945.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void iwl3945_disable_events(struct iwl_priv *priv) 


	ret = iwl_grab_nic_access(priv);

	if (ret) {

		IWL_WARNING("Can not read from adapter at this time.\n");

		IWL_WARN(priv, "Can not read from adapter at this time.\n");

		return;

	}
@@ -2095,7 +2095,7 @@ static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv) 


		/* sanity check on factory saturation power value */

		if (group->saturation_power < 40) {

			IWL_WARNING("Error: saturation power is %d, "

			IWL_WARN(priv, "Error: saturation power is %d, "

				    "less than minimum expected 40\n",

				    group->saturation_power);

			return;

drivers/net/wireless/iwlwifi/iwl-4965.c

+7 −5
Original line number Diff line number Diff line
@@ -1485,12 +1485,12 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, 


			/* stay within the table! */

			if (power_index > 107) {

				IWL_WARNING("txpower index %d > 107\n",

				IWL_WARN(priv, "txpower index %d > 107\n",

					    power_index);

				power_index = 107;

			}

			if (power_index < 0) {

				IWL_WARNING("txpower index %d < 0\n",

				IWL_WARN(priv, "txpower index %d < 0\n",

					    power_index);

				power_index = 0;

			}
@@ -1533,7 +1533,7 @@ static int iwl4965_send_tx_power(struct iwl_priv *priv) 
		/* If this gets hit a lot, switch it to a BUG() and catch

		 * the stack trace to find out who is calling this during

		 * a scan. */

		IWL_WARNING("TX Power requested while scanning!\n");

		IWL_WARN(priv, "TX Power requested while scanning!\n");

		return -EAGAIN;

	}
@@ -1839,7 +1839,8 @@ static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, 


	if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE,

			IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;
@@ -1910,7 +1911,8 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id, 


	if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE,

			IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;

drivers/net/wireless/iwlwifi/iwl-5000.c

+6 −3
Original line number Diff line number Diff line
@@ -676,7 +676,8 @@ static void iwl5000_init_alive_start(struct iwl_priv *priv) 
	iwl_clear_stations_table(priv);

	ret = priv->cfg->ops->lib->alive_notify(priv);

	if (ret) {

		IWL_WARNING("Could not complete ALIVE transition: %d\n", ret);

		IWL_WARN(priv,

			"Could not complete ALIVE transition: %d\n", ret);

		goto restart;

	}
@@ -1012,7 +1013,8 @@ static int iwl5000_txq_agg_enable(struct iwl_priv *priv, int txq_id, 


	if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL50_FIRST_AMPDU_QUEUE,

			IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;
@@ -1077,7 +1079,8 @@ static int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, 


	if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL50_FIRST_AMPDU_QUEUE,

			IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;

drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c

+10 −10
Original line number Diff line number Diff line
@@ -51,53 +51,53 @@ int iwl_agn_check_rxon_cmd(struct iwl_priv *priv) 
				(RXON_FLG_TGJ_NARROW_BAND_MSK |

				 RXON_FLG_RADAR_DETECT_MSK));

		if (error)

			IWL_WARNING("check 24G fields %d | %d\n",

			IWL_WARN(priv, "check 24G fields %d | %d\n",

				    counter++, error);

	} else {

		error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ?

				0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK);

		if (error)

			IWL_WARNING("check 52 fields %d | %d\n",

			IWL_WARN(priv, "check 52 fields %d | %d\n",

				    counter++, error);

		error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK);

		if (error)

			IWL_WARNING("check 52 CCK %d | %d\n",

			IWL_WARN(priv, "check 52 CCK %d | %d\n",

				    counter++, error);

	}

	error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1;

	if (error)

		IWL_WARNING("check mac addr %d | %d\n", counter++, error);

		IWL_WARN(priv, "check mac addr %d | %d\n", counter++, error);



	/* make sure basic rates 6Mbps and 1Mbps are supported */

	error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) &&

		  ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0));

	if (error)

		IWL_WARNING("check basic rate %d | %d\n", counter++, error);

		IWL_WARN(priv, "check basic rate %d | %d\n", counter++, error);



	error |= (le16_to_cpu(rxon->assoc_id) > 2007);

	if (error)

		IWL_WARNING("check assoc id %d | %d\n", counter++, error);

		IWL_WARN(priv, "check assoc id %d | %d\n", counter++, error);



	error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK));

	if (error)

		IWL_WARNING("check CCK and short slot %d | %d\n",

		IWL_WARN(priv, "check CCK and short slot %d | %d\n",

			    counter++, error);



	error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK));

	if (error)

		IWL_WARNING("check CCK & auto detect %d | %d\n",

		IWL_WARN(priv, "check CCK & auto detect %d | %d\n",

			    counter++, error);



	error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |

			RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK);

	if (error)

		IWL_WARNING("check TGG and auto detect %d | %d\n",

		IWL_WARN(priv, "check TGG and auto detect %d | %d\n",

			    counter++, error);



	if (error)

		IWL_WARNING("Tuning to channel %d\n",

		IWL_WARN(priv, "Tuning to channel %d\n",

			    le16_to_cpu(rxon->channel));



	if (error) {

drivers/net/wireless/iwlwifi/iwl-agn.c

+17 −17
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void iwl_clear_free_frames(struct iwl_priv *priv) 
	}



	if (priv->frames_count) {

		IWL_WARNING("%d frames still in use.  Did we lose one?\n",

		IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",

			    priv->frames_count);

		priv->frames_count = 0;

	}
@@ -745,7 +745,7 @@ static int iwl_set_mode(struct iwl_priv *priv, int mode) 


	cancel_delayed_work(&priv->scan_check);

	if (iwl_scan_cancel_timeout(priv, 100)) {

		IWL_WARNING("Aborted scan still in progress after 100ms\n");

		IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");

		IWL_DEBUG_MAC80211("leaving - scan abort failed.\n");

		return -EAGAIN;

	}
@@ -841,7 +841,7 @@ static void iwl_rx_reply_alive(struct iwl_priv *priv, 
		queue_delayed_work(priv->workqueue, pwork,

				   msecs_to_jiffies(5));

	else

		IWL_WARNING("uCode did not respond OK.\n");

		IWL_WARN(priv, "uCode did not respond OK.\n");

}



static void iwl_rx_reply_error(struct iwl_priv *priv,
@@ -1193,7 +1193,7 @@ void iwl_rx_handle(struct iwl_priv *priv) 
			if (rxb && rxb->skb)

				iwl_tx_cmd_complete(priv, rxb);

			else

				IWL_WARNING("Claim null rxb?\n");

				IWL_WARN(priv, "Claim null rxb?\n");

		}



		/* For now we just don't re-use anything.  We can tweak this
@@ -1457,9 +1457,9 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) 
		IWL_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled);



	if (inta & ~CSR_INI_SET_MASK) {

		IWL_WARNING("Disabled INTA bits 0x%08x were pending\n",

		IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",

			 inta & ~CSR_INI_SET_MASK);

		IWL_WARNING("   with FH_INT = 0x%08x\n", inta_fh);

		IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);

	}



	/* Re-enable all interrupts */
@@ -1511,7 +1511,7 @@ static irqreturn_t iwl_isr(int irq, void *data) 
	if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {

		/* Hardware disappeared. It might have already raised

		 * an interrupt */

		IWL_WARNING("HARDWARE GONE?? INTA == 0x%08x\n", inta);

		IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);

		goto unplugged;

	}
@@ -1833,8 +1833,8 @@ static void iwl_alive_start(struct iwl_priv *priv) 
	iwl_clear_stations_table(priv);

	ret = priv->cfg->ops->lib->alive_notify(priv);

	if (ret) {

		IWL_WARNING("Could not complete ALIVE transition [ntf]: %d\n",

			    ret);

		IWL_WARN(priv,

			"Could not complete ALIVE transition [ntf]: %d\n", ret);

		goto restart;

	}
@@ -2020,7 +2020,7 @@ static int __iwl_up(struct iwl_priv *priv) 
	int ret;



	if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {

		IWL_WARNING("Exit pending; will not bring the NIC up\n");

		IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");

		return -EIO;

	}
@@ -2037,7 +2037,7 @@ static int __iwl_up(struct iwl_priv *priv) 


	if (iwl_is_rfkill(priv)) {

		iwl_enable_interrupts(priv);

		IWL_WARNING("Radio disabled by %s RF Kill switch\n",

		IWL_WARN(priv, "Radio disabled by %s RF Kill switch\n",

		    test_bit(STATUS_RF_KILL_HW, &priv->status) ? "HW" : "SW");

		return 0;

	}
@@ -2163,7 +2163,7 @@ static void iwl_bg_rf_kill(struct work_struct *work) 
			IWL_DEBUG_RF_KILL("Can not turn radio back on - "

					  "disabled by SW switch\n");

		else

			IWL_WARNING("Radio Frequency Kill Switch is On:\n"

			IWL_WARN(priv, "Radio Frequency Kill Switch is On:\n"

				    "Kill switch must be turned off for "

				    "wireless networking to work.\n");

	}
@@ -2267,7 +2267,7 @@ static void iwl_post_associate(struct iwl_priv *priv) 
	ret = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,

			      sizeof(priv->rxon_timing), &priv->rxon_timing);

	if (ret)

		IWL_WARNING("REPLY_RXON_TIMING failed - "

		IWL_WARN(priv, "REPLY_RXON_TIMING failed - "

			    "Attempting to continue.\n");



	priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
@@ -2668,7 +2668,7 @@ static void iwl_config_ap(struct iwl_priv *priv) 
		ret = iwl_send_cmd_pdu(priv, REPLY_RXON_TIMING,

				sizeof(priv->rxon_timing), &priv->rxon_timing);

		if (ret)

			IWL_WARNING("REPLY_RXON_TIMING failed - "

			IWL_WARN(priv, "REPLY_RXON_TIMING failed - "

					"Attempting to continue.\n");



		iwl_set_rxon_chain(priv);
@@ -2774,7 +2774,7 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, 
		/* If there is currently a HW scan going on in the background

		 * then we need to cancel it else the RXON below will fail. */

		if (iwl_scan_cancel_timeout(priv, 100)) {

			IWL_WARNING("Aborted scan still in progress "

			IWL_WARN(priv, "Aborted scan still in progress "

				    "after 100ms\n");

			IWL_DEBUG_MAC80211("leaving - scan abort failed.\n");

			mutex_unlock(&priv->mutex);
@@ -3467,7 +3467,7 @@ static ssize_t store_flags(struct device *d, 
	if (le32_to_cpu(priv->staging_rxon.flags) != flags) {

		/* Cancel any currently running scans... */

		if (iwl_scan_cancel_timeout(priv, 100))

			IWL_WARNING("Could not cancel scan.\n");

			IWL_WARN(priv, "Could not cancel scan.\n");

		else {

			IWL_DEBUG_INFO("Commit rxon.flags = 0x%04X\n", flags);

			priv->staging_rxon.flags = cpu_to_le32(flags);
@@ -3506,7 +3506,7 @@ static ssize_t store_filter_flags(struct device *d, 
	if (le32_to_cpu(priv->staging_rxon.filter_flags) != filter_flags) {

		/* Cancel any currently running scans... */

		if (iwl_scan_cancel_timeout(priv, 100))

			IWL_WARNING("Could not cancel scan.\n");

			IWL_WARN(priv, "Could not cancel scan.\n");

		else {

			IWL_DEBUG_INFO("Committing rxon.filter_flags = "

				       "0x%04X\n", filter_flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE