Commit 004a1e16 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8821ae: Remove all instances of DBG_EMERG 



This is a step toward eliminating the RT_TRACE macros. Those calls that
have DBG_EMERG as the level are always logged, and they represent error
conditions, thus they are replaced with pr_err().

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b03d968b

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c

+1 −2
Original line number Diff line number Diff line
@@ -604,8 +604,7 @@ static void rtl8821ae_dm_find_minimum_rssi(struct ieee80211_hw *hw) 
	if ((mac->link_state < MAC80211_LINKED) &&

	    (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {

		rtl_dm_dig->min_undec_pwdb_for_dm = 0;

		RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,

			 "Not connected to any\n");

		pr_debug("rtl8821ae: Not connected to any AP\n");

	}

	if (mac->link_state >= MAC80211_LINKED) {

		if (mac->opmode == NL80211_IFTYPE_AP ||

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c

+5 −7
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ static void _rtl8821ae_write_fw(struct ieee80211_hw *hw, 
	remainsize = size % FW_8821AE_PAGE_SIZE;



	if (pagenums > 8) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Page numbers should not greater then 8\n");

		pr_err("Page numbers should not greater then 8\n");

	}



	for (page = 0; page < pagenums; page++) {
@@ -162,8 +161,8 @@ static int _rtl8821ae_fw_free_to_go(struct ieee80211_hw *hw) 
		goto exit;

	}



	RT_TRACE(rtlpriv, COMP_FW, DBG_EMERG,

		 "Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32);

	pr_err("Checksum report OK! REG_MCUFWDL:0x%08x\n",

	       value32);



	value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);

	value32 |= MCUFWDL_RDY;
@@ -186,8 +185,7 @@ static int _rtl8821ae_fw_free_to_go(struct ieee80211_hw *hw) 
		udelay(FW_8821AE_POLLING_DELAY);

	} while (counter++ < FW_8821AE_POLLING_TIMEOUT_COUNT);



	RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

		 "Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n",

	pr_err("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n",

	       value32);



exit:

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c

+6 −9
Original line number Diff line number Diff line
@@ -822,8 +822,7 @@ static bool _rtl8821ae_llt_write(struct ieee80211_hw *hw, u32 address, u32 data) 
			break;



		if (count > POLLING_LLT_THRESHOLD) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Failed to polling write LLT done at address %d!\n",

			pr_err("Failed to polling write LLT done at address %d!\n",

			       address);

			status = false;

			break;
@@ -1927,7 +1926,7 @@ int rtl8821ae_hw_init(struct ieee80211_hw *hw) 


	rtstatus = _rtl8821ae_init_mac(hw);

	if (rtstatus != true) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");

		pr_err("Init MAC failed\n");

		err = 1;

		return err;

	}
@@ -2174,8 +2173,7 @@ static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw, 
			 "Set Network type to AP!\n");

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Network type %d not support!\n", type);

		pr_err("Network type %d not support!\n", type);

		return 1;

	}
@@ -3275,7 +3273,7 @@ void rtl8821ae_read_eeprom_info(struct ieee80211_hw *hw) 
		rtlefuse->autoload_failflag = false;

		_rtl8821ae_read_adapter_info(hw, false);

	} else {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");

		pr_err("Autoload ERR!!\n");

	}

	/*hal_ReadRFType_8812A()*/

	/* _rtl8821ae_hal_customized_behavior(hw); */
@@ -3950,8 +3948,7 @@ void rtl8821ae_set_key(struct ieee80211_hw *hw, u32 key_index, 
				if (mac->opmode == NL80211_IFTYPE_AP) {

					entry_id = rtl_cam_get_free_entry(hw, p_macaddr);

					if (entry_id >=  TOTAL_CAM_ENTRY) {

						RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,

							 "Can not find free hwsecurity cam entry\n");

						pr_err("an not find free hwsecurity cam entry\n");

						return;

					}

				} else {

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c

+19 −27
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw, 
static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw,

					 enum radio_path rfpath, u32 offset)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	bool is_pi_mode = false;

	u32 retvalue = 0;
@@ -223,7 +222,7 @@ static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw, 
	/* 2009/06/17 MH We can not execute IO for power

	save or other accident mode.*/

	if (RT_CANNOT_IO(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");

		pr_err("return all one\n");

		return 0xFFFFFFFF;

	}

	/* <20120809, Kordan> CCA OFF(when entering),
@@ -284,7 +283,7 @@ static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw, 
	u32 newoffset;



	if (RT_CANNOT_IO(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");

		pr_err("stop\n");

		return;

	}

	offset &= 0xff;
@@ -1665,7 +1664,7 @@ static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw) 
	rtstatus = _rtl8821ae_phy_config_bb_with_headerfile(hw,

						       BASEBAND_CONFIG_PHY_REG);

	if (rtstatus != true) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");

		pr_err("Write BB Reg Fail!!\n");

		return false;

	}

	_rtl8821ae_phy_init_tx_power_by_rate(hw);
@@ -1674,7 +1673,7 @@ static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw) 
						    BASEBAND_CONFIG_PHY_REG);

	}

	if (rtstatus != true) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");

		pr_err("BB_PG Reg Fail!!\n");

		return false;

	}
@@ -1688,7 +1687,7 @@ static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw) 
						BASEBAND_CONFIG_AGC_TAB);



	if (rtstatus != true) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");

		pr_err("AGC Table Fail\n");

		return false;

	}

	rtlphy->cck_high_power = (bool)(rtl_get_bbreg(hw,
@@ -2064,8 +2063,7 @@ bool rtl8812ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, 
		break;

	case RF90_PATH_C:

	case RF90_PATH_D:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "switch case %#x not processed\n", rfpath);

		pr_err("switch case %#x not processed\n", rfpath);

		break;

	}

	return true;
@@ -2132,8 +2130,7 @@ bool rtl8821ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, 
	case RF90_PATH_B:

	case RF90_PATH_C:

	case RF90_PATH_D:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "switch case %#x not processed\n", rfpath);

		pr_err("switch case %#x not processed\n", rfpath);

		break;

	}

	return true;
@@ -3336,8 +3333,7 @@ void rtl8821ae_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation) 
						      (u8 *)&iotype);

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Unknown Scan Backup operation.\n");

			pr_err("Unknown Scan Backup operation.\n");

			break;

		}

	}
@@ -3378,8 +3374,7 @@ static u8 _rtl8821ae_phy_get_secondary_chnl(struct rtl_priv *rtlpriv) 
		else if (mac->cur_80_prime_sc == PRIME_CHNL_OFFSET_UPPER)

			sc_set_40 = VHT_DATA_SC_40_UPPER_OF_80MHZ;

		else

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				"SCMapping: Not Correct Primary40MHz Setting\n");

			pr_err("SCMapping: Not Correct Primary40MHz Setting\n");



		if ((mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_LOWER) &&

			(mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER))
@@ -3394,16 +3389,14 @@ static u8 _rtl8821ae_phy_get_secondary_chnl(struct rtl_priv *rtlpriv) 
			(mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_UPPER))

			sc_set_20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;

		else

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				"SCMapping: Not Correct Primary40MHz Setting\n");

			pr_err("SCMapping: Not Correct Primary40MHz Setting\n");

	} else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {

		if (mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_UPPER)

			sc_set_20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;

		else if (mac->cur_40_prime_sc == PRIME_CHNL_OFFSET_LOWER)

			sc_set_20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;

		else

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "SCMapping: Not Correct Primary40MHz Setting\n");

			pr_err("SCMapping: Not Correct Primary40MHz Setting\n");

	}

	return (sc_set_40 << 4) | sc_set_20;

}
@@ -3479,8 +3472,8 @@ void rtl8821ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 


		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);

		pr_err("unknown bandwidth: %#X\n",

		       rtlphy->current_chan_bw);

		break;

	}
@@ -4660,8 +4653,8 @@ bool rtl8821ae_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype) 
			postprocessing = true;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "switch case %#x not processed\n", iotype);

			pr_err("switch case %#x not processed\n",

			       iotype);

			break;

		}

	} while (false);
@@ -4704,8 +4697,7 @@ static void rtl8821ae_phy_set_io(struct ieee80211_hw *hw) 
	case IO_CMD_PAUSE_BAND1_DM_BY_SCAN:

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "switch case %#x not processed\n",

		pr_err("switch case %#x not processed\n",

		       rtlphy->current_io_type);

		break;

	}
@@ -4811,8 +4803,8 @@ static bool _rtl8821ae_phy_set_rf_power_state(struct ieee80211_hw *hw, 
		}

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "switch case %#x not processed\n", rfpwr_state);

		pr_err("switch case %#x not processed\n",

		       rfpwr_state);

		bresult = false;

		break;

	}

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c

+1 −4
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ static bool _rtl8821ae_phy_rf6052_config_parafile(struct ieee80211_hw *hw); 


void rtl8821ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	switch (bandwidth) {

	case HT_CHANNEL_WIDTH_20:

		rtl_set_rfreg(hw, RF90_PATH_A, RF_CHNLBW, BIT(11)|BIT(10), 3);
@@ -50,8 +48,7 @@ void rtl8821ae_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth) 
		rtl_set_rfreg(hw, RF90_PATH_B, RF_CHNLBW, BIT(11)|BIT(10), 0);

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "unknown bandwidth: %#X\n", bandwidth);

		pr_err("unknown bandwidth: %#X\n", bandwidth);

		break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE