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

rtlwifi: rtl8192se: 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 c7532b87

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

+17 −29
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ static u8 _rtl92s_firmware_header_map_rftype(struct ieee80211_hw *hw) 
	case RF_2T2R:

		return 0x22;

	default:

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unknown RF type(%x)\n",

			 rtlphy->rf_type);

		pr_err("Unknown RF type(%x)\n", rtlphy->rf_type);

		break;

	}

	return 0x22;
@@ -168,9 +167,7 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw, 
	_rtl92s_fw_set_rqpn(hw);



	if (buffer_len >= MAX_FIRMWARE_CODE_SIZE) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Size over FIRMWARE_CODE_SIZE!\n");



		pr_err("Size over FIRMWARE_CODE_SIZE!\n");

		return false;

	}
@@ -239,8 +236,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
		} while (pollingcnt--);



		if (!(cpustatus & IMEM_CHK_RPT) || (pollingcnt <= 0)) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "FW_STATUS_LOAD_IMEM FAIL CPU, Status=%x\n",

			pr_err("FW_STATUS_LOAD_IMEM FAIL CPU, Status=%x\n",

			       cpustatus);

			goto status_check_fail;

		}
@@ -257,8 +253,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
		} while (pollingcnt--);



		if (!(cpustatus & EMEM_CHK_RPT) || (pollingcnt <= 0)) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "FW_STATUS_LOAD_EMEM FAIL CPU, Status=%x\n",

			pr_err("FW_STATUS_LOAD_EMEM FAIL CPU, Status=%x\n",

			       cpustatus);

			goto status_check_fail;

		}
@@ -266,8 +261,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
		/* Turn On CPU */

		rtstatus = _rtl92s_firmware_enable_cpu(hw);

		if (!rtstatus) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Enable CPU fail!\n");

			pr_err("Enable CPU fail!\n");

			goto status_check_fail;

		}

		break;
@@ -282,8 +276,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
		} while (pollingcnt--);



		if (!(cpustatus & DMEM_CODE_DONE) || (pollingcnt <= 0)) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Polling DMEM code done fail ! cpustatus(%#x)\n",

			pr_err("Polling DMEM code done fail ! cpustatus(%#x)\n",

			       cpustatus);

			goto status_check_fail;

		}
@@ -308,8 +301,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 


		if (((cpustatus & LOAD_FW_READY) != LOAD_FW_READY) ||

		    (pollingcnt <= 0)) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Polling Load Firmware ready fail ! cpustatus(%x)\n",

			pr_err("Polling Load Firmware ready fail ! cpustatus(%x)\n",

			       cpustatus);

			goto status_check_fail;

		}
@@ -331,8 +323,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
		break;



	default:

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,

			 "Unknown status check!\n");

		pr_err("Unknown status check!\n");

		rtstatus = false;

		break;

	}
@@ -380,8 +371,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) 
	/* 2. Retrieve IMEM image. */

	if ((pfwheader->img_imem_size == 0) || (pfwheader->img_imem_size >

	    sizeof(firmware->fw_imem))) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "memory for data image is less than IMEM required\n");

		pr_err("memory for data image is less than IMEM required\n");

		goto fail;

	} else {

		puc_mappedfile += fwhdr_size;
@@ -393,8 +383,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) 


	/* 3. Retriecve EMEM image. */

	if (pfwheader->img_sram_size > sizeof(firmware->fw_emem)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "memory for data image is less than EMEM required\n");

		pr_err("memory for data image is less than EMEM required\n");

		goto fail;

	} else {

		puc_mappedfile += firmware->fw_imem_len;
@@ -428,8 +417,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) 
					RT_8192S_FIRMWARE_HDR_EXCLUDE_PRI_SIZE;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Unexpected Download step!!\n");

			pr_err("Unexpected Download step!!\n");

			goto fail;

		}
@@ -438,14 +426,14 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) 
				ul_filelength);



		if (!rtstatus) {

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

			pr_err("fail!\n");

			goto fail;

		}



		/* <3> Check whether load FW process is ready */

		rtstatus = _rtl92s_firmware_checkready(hw, fwstatus);

		if (!rtstatus) {

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

			pr_err("rtl8192se: firmware fail!\n");

			goto fail;

		}

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

+16 −25
Original line number Diff line number Diff line
@@ -75,13 +75,11 @@ void rtl92se_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

	case HAL_DEF_WOWLAN:

		break;

	default: {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

	default:

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

		break;

	}

}

}



void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)

{
@@ -294,8 +292,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
					acm_ctrl &= (~AcmHw_VoqEn);

					break;

				default:

					RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

					       e_aci);

					break;

				}
@@ -431,8 +428,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

		break; }

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

		break;

	}
@@ -745,8 +741,7 @@ static void _rtl92se_macconfig_before_fwdownload(struct ieee80211_hw *hw) 
	} while (pollingcnt--);



	if (pollingcnt <= 0) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Polling TXDMA_INIT_VALUE timeout!! Current TCR(%#x)\n",

		pr_err("Polling TXDMA_INIT_VALUE timeout!! Current TCR(%#x)\n",

		       tmpu1b);

		tmpu1b = rtl_read_byte(rtlpriv, CMDR);

		rtl_write_byte(rtlpriv, CMDR, tmpu1b & (~TXDMA_EN));
@@ -1004,7 +999,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 


	/* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */

	if (!rtl92s_phy_mac_config(hw)) {

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

		pr_err("MAC Config failed\n");

		err = rtstatus;

		goto exit;

	}
@@ -1024,7 +1019,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 


	/* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */

	if (!rtl92s_phy_bb_config(hw)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n");

		pr_err("BB Config failed\n");

		err = rtstatus;

		goto exit;

	}
@@ -1194,8 +1189,7 @@ static int _rtl92se_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 supported!\n", type);

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

		return 1;



	}
@@ -1685,8 +1679,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) 
		break;



	case EEPROM_93C46:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "RTL819X Not boot from eeprom, check it !!\n");

		pr_err("RTL819X Not boot from eeprom, check it !!\n");

		return;



	default:
@@ -2030,7 +2023,7 @@ void rtl92se_read_eeprom_info(struct ieee80211_hw *hw) 
		rtlefuse->autoload_failflag = false;

		_rtl92se_read_adapter_info(hw);

	} else {

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

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

		rtlefuse->autoload_failflag = true;

	}

}
@@ -2463,8 +2456,8 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr, 
			enc_algo = CAM_AES;

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

			       enc_algo);

			enc_algo = CAM_TKIP;

			break;

		}
@@ -2481,9 +2474,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr, 
					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/rtl8192se/led.c

+4 −4
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, LEDCFG, ledcfg & 0x0f);

		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;
@@ -99,8 +99,8 @@ void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, LEDCFG, (ledcfg | BIT(3)));

		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/rtl8192se/phy.c

+16 −23
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, 
void rtl92s_phy_scan_operation_backup(struct ieee80211_hw *hw,

				      u8 operation)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

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



	if (!is_hal_stop(rtlhal)) {
@@ -247,8 +246,7 @@ void rtl92s_phy_scan_operation_backup(struct ieee80211_hw *hw, 
			rtl92s_phy_set_fw_cmd(hw, FW_CMD_RESUME_DM_BY_SCAN);

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

				 "Unknown operation\n");

			pr_err("Unknown operation\n");

			break;

		}

	}
@@ -288,8 +286,8 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw, 
		rtl_write_byte(rtlpriv, BW_OPMODE, reg_bw_opmode);

		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;

	}
@@ -313,8 +311,8 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw, 
			rtl_write_byte(rtlpriv, RFPGA0_ANALOGPARAMETER2, 0x18);

		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;

	}
@@ -437,8 +435,7 @@ static bool _rtl92s_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, 
			}

			break;

		default:

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

			       currentcmd->cmdid);

			break;

		}
@@ -644,8 +641,8 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw, 
			_rtl92se_phy_set_rf_sleep(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;

	}
@@ -937,8 +934,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw) 
	}



	if (!rtstatus) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,

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

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

		goto phy_BB8190_Config_ParaFile_Fail;

	}
@@ -951,8 +947,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw) 
						 BASEBAND_CONFIG_PHY_REG);

	}

	if (!rtstatus) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,

			 "_rtl92s_phy_bb_config_parafile(): BB_PG Reg Fail!!\n");

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

		goto phy_BB8190_Config_ParaFile_Fail;

	}
@@ -1077,11 +1072,9 @@ bool rtl92s_phy_bb_config(struct ieee80211_hw *hw) 
	    (rtlphy->rf_type == RF_1T2R && rf_num != 2) ||

	    (rtlphy->rf_type == RF_2T2R && rf_num != 2) ||

	    (rtlphy->rf_type == RF_2T2R_GREEN && rf_num != 2)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,

			 "RF_Type(%x) does not match RF_Num(%x)!!\n",

		pr_err("RF_Type(%x) does not match RF_Num(%x)!!\n",

		       rtlphy->rf_type, rf_num);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,

			 "path1 0x%x, path2 0x%x, pathmap 0x%x\n",

		pr_err("path1 0x%x, path2 0x%x, pathmap 0x%x\n",

		       path1, path2, pathmap);

	}
@@ -1221,7 +1214,7 @@ void rtl92s_phy_chk_fwcmd_iodone(struct ieee80211_hw *hw) 
	} while (--pollingcnt);



	if (pollingcnt == 0)

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Set FW Cmd fail!!\n");

		pr_err("Set FW Cmd fail!!\n");

}

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

+1 −2
Original line number Diff line number Diff line
@@ -523,8 +523,7 @@ void rtl92s_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