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

rtlwifi: rtl8192de: 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 2d15acac

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

+9 −13
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw, 
	pagenums = size / FW_8192D_PAGE_SIZE;

	remainSize = size % FW_8192D_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++) {

		offset = page * FW_8192D_PAGE_SIZE;
@@ -153,8 +152,7 @@ static int _rtl92d_fw_free_to_go(struct ieee80211_hw *hw) 
	} while ((counter++ < FW_8192D_POLLING_TIMEOUT_COUNT) &&

		 (!(value32 & FWDL_ChkSum_rpt)));

	if (counter >= FW_8192D_POLLING_TIMEOUT_COUNT) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

		       value32);

		return -EIO;

	}
@@ -327,8 +325,7 @@ int rtl92d_download_fw(struct ieee80211_hw *hw) 
	rtl_write_byte(rtlpriv, 0x1f, value);

	spin_unlock_irqrestore(&globalmutex_for_fwdownload, flags);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

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

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

		goto exit;

	} else {

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "fw is ready to run!\n");
@@ -407,8 +404,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw, 
	while (!bwrite_success) {

		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;

		}

		boxnum = rtlhal->last_hmeboxnum;
@@ -430,8 +426,8 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw, 
			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;

		}

		isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
@@ -507,8 +503,8 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw, 
					       boxcontent[idx]);

			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;

		}

		bwrite_success = true;

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

+13 −22
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ void rtl92de_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);

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

		break;

	}

}
@@ -358,8 +357,7 @@ void rtl92de_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;

			}
@@ -500,8 +498,7 @@ void rtl92de_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;

	}

}
@@ -520,8 +517,7 @@ static bool _rtl92de_llt_write(struct ieee80211_hw *hw, u32 address, u32 data) 
		if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value))

			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;
@@ -920,7 +916,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw) 
	/* rtlpriv->intf_ops->disable_aspm(hw); */

	rtstatus = _rtl92de_init_mac(hw);

	if (!rtstatus) {

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

		pr_err("Init MAC failed\n");

		err = 1;

		spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);

		return err;
@@ -1119,11 +1115,8 @@ static int _rtl92de_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;

		break;



	}

	rtl_write_byte(rtlpriv, MSR, bt_msr);

	rtlpriv->cfg->ops->led_control(hw, ledaction);
@@ -1732,7 +1725,7 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw) 
		break;

	default:

		chipver |= CHIP_92D_D_CUT;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unknown CUT!\n");

		pr_err("Unknown CUT!\n");

		break;

	}

	rtlpriv->rtlhal.version = chipver;
@@ -1816,7 +1809,7 @@ void rtl92de_read_eeprom_info(struct ieee80211_hw *hw) 
		rtlefuse->autoload_failflag = false;

		_rtl92de_read_adapter_info(hw);

	} else {

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

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

	}

	return;

}
@@ -2169,8 +2162,8 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index, 
			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;

		}
@@ -2186,9 +2179,7 @@ void rtl92de_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/rtl8192de/led.c

+4 −4
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, REG_LEDCFG2, (ledcfg & 0x0f) | BIT(5));

		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;
@@ -101,8 +101,8 @@ void rtl92de_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
		rtl_write_byte(rtlpriv, REG_LEDCFG2, (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/rtl8192de/phy.c

+16 −19
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw) 
	rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,

		BASEBAND_CONFIG_PHY_REG);

	if (!rtstatus) {

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

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

		return false;

	}
@@ -731,13 +731,13 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw) 
			BASEBAND_CONFIG_PHY_REG);

	}

	if (!rtstatus) {

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

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

		return false;

	}

	rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,

		BASEBAND_CONFIG_AGC_TAB);

	if (!rtstatus) {

		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,
@@ -833,8 +833,7 @@ bool rtl92d_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;
@@ -987,8 +986,8 @@ void rtl92d_phy_set_bw_mode(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;

	}

	switch (rtlphy->current_chan_bw) {
@@ -1019,8 +1018,8 @@ void rtl92d_phy_set_bw_mode(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;



	}
@@ -2842,8 +2841,7 @@ static bool _rtl92d_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, 
			rtl92d_phy_reload_iqk_setting(hw, channel);

			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;

		}
@@ -2956,8 +2954,7 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw) 
		rtl92d_dm_write_dig(hw);

		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;

	}
@@ -2988,8 +2985,8 @@ bool rtl92d_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);
@@ -3176,8 +3173,8 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw, 
		_rtl92d_phy_set_rfsleep(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/rtl8192de/rf.c

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth) 
		}

		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