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

rtlwifi: rtl8723ae: 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 4e2b4378

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

+5 −6
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
	while (!bwrite_sucess) {

		wait_writeh2c_limmit--;

		if (wait_writeh2c_limmit == 0) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Write H2C fail because no trigger for FW INT!\n");

			pr_err("Write H2C fail because no trigger for FW INT!\n");

			break;

		}
@@ -123,8 +122,8 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
			box_extreg = REG_HMEBOX_EXT_3;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

			       boxnum);

			break;

		}
@@ -229,8 +228,8 @@ static void _rtl8723e_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id, 
			}

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

			       cmd_len);

			break;

		}

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

+7 −12
Original line number Diff line number Diff line
@@ -570,8 +570,7 @@ static bool _rtl8723e_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;
@@ -961,7 +960,7 @@ int rtl8723e_hw_init(struct ieee80211_hw *hw) 
	rtlpriv->intf_ops->disable_aspm(hw);

	rtstatus = _rtl8712e_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;

		goto exit;

	}
@@ -1107,8 +1106,7 @@ static enum version_8723e _rtl8723e_read_chip_version(struct ieee80211_hw *hw) 
			 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT.\n");

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Chip Version ID: Unknown. Bug?\n");

		pr_err("Chip Version ID: Unknown. Bug?\n");

		break;

	}
@@ -1157,8 +1155,7 @@ static int _rtl8723e_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;

		break;

	}
@@ -1852,7 +1849,7 @@ void rtl8723e_read_eeprom_info(struct ieee80211_hw *hw) 
	} else {

		rtlefuse->autoload_failflag = true;

		_rtl8723e_read_adapter_info(hw, false);

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

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

	}

	_rtl8723e_hal_customized_behavior(hw);

}
@@ -2245,9 +2242,7 @@ void rtl8723e_set_key(struct ieee80211_hw *hw, u32 key_index, 
					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 hw security cam entry\n");

						pr_err("Can not find free hw security cam entry\n");

						return;

					}

				} else {

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c

+4 −4
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ void rtl8723e_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, REG_LEDCFG1, ledcfg & 0x10);

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "switch case %#x not processed\n", pled->ledpin);

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

		       pled->ledpin);

		break;

	}

	pled->ledon = true;
@@ -100,8 +100,8 @@ void rtl8723e_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 


		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "switch case %#x not processed\n", pled->ledpin);

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

		       pled->ledpin);

		break;

	}

	pled->ledon = false;

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

+10 −11
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static bool _rtl8723e_phy_bb8192c_config_parafile(struct ieee80211_hw *hw) 
	rtstatus = _rtl8723e_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;

	}
@@ -227,13 +227,13 @@ static bool _rtl8723e_phy_bb8192c_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;

	}

	rtstatus =

	  _rtl8723e_phy_config_bb_with_headerfile(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,
@@ -749,8 +749,7 @@ void rtl8723e_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;

		}

	}
@@ -791,8 +790,8 @@ void rtl8723e_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 
		rtl_write_byte(rtlpriv, REG_RRSR + 2, reg_prsr_rsc);

		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;

	}
@@ -816,8 +815,8 @@ void rtl8723e_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 
			       HAL_PRIME_CHNL_OFFSET_LOWER) ? 2 : 1);

		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;

	}

	rtl8723e_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
@@ -977,8 +976,8 @@ static bool _rtl8723e_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, 
			currentcmd = &postcommoncmd[*step];

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Invalid 'stage' = %d, Check it!\n", *stage);

			pr_err("Invalid 'stage' = %d, Check it!\n",

			       *stage);

			return true;

		}

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

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ void rtl8723e_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth) 
			      rtlphy->rfreg_chnlval[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