Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rtlwifi: rtl8723-common: 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 a44f59d6

drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c

+7 −10
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ void rtl8723_write_fw(struct ieee80211_hw *hw, 
	remain_size = size % FW_8192C_PAGE_SIZE;



	if (page_nums > max_page) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Page numbers should not greater than %d\n", max_page);

		pr_err("Page numbers should not greater than %d\n",

		       max_page);

	}

	for (page = 0; page < page_nums; page++) {

		offset = page * FW_8192C_PAGE_SIZE;
@@ -209,8 +209,7 @@ int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be, 
		 (!(value32 & FWDL_CHKSUM_RPT)));



	if (counter >= max_count) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "chksum report fail ! REG_MCUFWDL:0x%08x .\n",

		pr_err("chksum report fail ! REG_MCUFWDL:0x%08x .\n",

		       value32);

		goto exit;

	}
@@ -239,8 +238,7 @@ int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be, 


	} while (counter++ < max_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:
@@ -294,8 +292,7 @@ int rtl8723_download_fw(struct ieee80211_hw *hw, 


	err = rtl8723_fw_free_to_go(hw, is_8723be, max_count);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Firmware is not ready to run!\n");

		pr_err("Firmware is not ready to run!\n");

	} else {

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

			 "Firmware is ready to run!\n");

drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ u32 rtl8723_phy_rf_serial_read(struct ieee80211_hw *hw, 
	offset &= 0xff;

	newoffset = offset;

	if (RT_CANNOT_IO(hw)) {

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

		pr_err("return all one\n");

		return 0xFFFFFFFF;

	}

	tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
@@ -147,7 +147,7 @@ void rtl8723_phy_rf_serial_write(struct ieee80211_hw *hw, 
	struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];



	if (RT_CANNOT_IO(hw)) {

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

		pr_err("stop\n");

		return;

	}

	offset &= 0xff;