Commit dcbf179c authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

wifi: rtw88: access chip_info by const pointer 



Since chip_info has became const table, we must access them via const
pointer to avoid invalid writing.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220727065232.28510-1-pkshih@realtek.com
parent 86331c7e

drivers/net/wireless/realtek/rtw88/bf.c

+1 −1
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ void rtw_bf_disassoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, 
void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,

		  struct ieee80211_bss_conf *bss_conf)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct ieee80211_hw *hw = rtwdev->hw;

	struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;

	struct rtw_bfee *bfee = &rtwvif->bfee;

	struct rtw_bf_info *bfinfo = &rtwdev->bf_info;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct ieee80211_sta *sta;

	struct ieee80211_sta_vht_cap *vht_cap;

	struct ieee80211_sta_vht_cap *ic_vht_cap;

drivers/net/wireless/realtek/rtw88/coex.c

+44 −44
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
static u8 rtw_coex_next_rssi_state(struct rtw_dev *rtwdev, u8 pre_state,

				   u8 rssi, u8 rssi_thresh)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	u8 tol = chip->rssi_tolerance;

	u8 next_state;
@@ -36,7 +36,7 @@ static u8 rtw_coex_next_rssi_state(struct rtw_dev *rtwdev, u8 pre_state, 
static void rtw_coex_limited_tx(struct rtw_dev *rtwdev,

				bool tx_limit_en, bool ampdu_limit_en)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u8 num_of_active_port = 1;
@@ -365,7 +365,7 @@ static void rtw_coex_set_wl_pri_mask(struct rtw_dev *rtwdev, u8 bitmap, 


void rtw_coex_write_scbd(struct rtw_dev *rtwdev, u16 bitpos, bool set)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u16 val = 0x2;
@@ -400,7 +400,7 @@ EXPORT_SYMBOL(rtw_coex_write_scbd); 


static u16 rtw_coex_read_scbd(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	if (!chip->scbd_support)

		return 0;
@@ -410,7 +410,7 @@ static u16 rtw_coex_read_scbd(struct rtw_dev *rtwdev) 


static void rtw_coex_check_rfk(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_rfe *coex_rfe = &coex->rfe;
@@ -489,7 +489,7 @@ static void rtw_coex_monitor_bt_ctr(struct rtw_dev *rtwdev) 


static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;
@@ -524,10 +524,10 @@ static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev) 


static void rtw_coex_update_wl_link_info(struct rtw_dev *rtwdev, u8 reason)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_traffic_stats *stats = &rtwdev->stats;

	bool is_5G = false;

	bool wl_busy = false;
@@ -706,10 +706,10 @@ static const char *rtw_coex_get_bt_status_string(u8 bt_status) 


static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 i;

	u8 rssi_state;

	u8 rssi_step;
@@ -806,7 +806,7 @@ static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev) 


static void rtw_coex_update_wl_ch_info(struct rtw_dev *rtwdev, u8 type)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_coex_dm *coex_dm = &rtwdev->coex.dm;

	struct rtw_coex_stat *coex_stat = &rtwdev->coex.stat;
@@ -933,7 +933,7 @@ EXPORT_SYMBOL(rtw_coex_write_indirect_reg); 


static void rtw_coex_coex_ctrl_owner(struct rtw_dev *rtwdev, bool wifi_control)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_hw_reg *btg_reg = chip->btg_reg;



	if (wifi_control) {
@@ -981,7 +981,7 @@ static void rtw_coex_mimo_ps(struct rtw_dev *rtwdev, bool force, bool state) 
static void rtw_btc_wltoggle_table_a(struct rtw_dev *rtwdev, bool force,

				     u8 table_case)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	u8 h2c_para[6] = {0};

	u32 table_wl = 0x5a5a5a5a;
@@ -1065,9 +1065,9 @@ static void rtw_coex_set_table(struct rtw_dev *rtwdev, bool force, u32 table0, 


static void rtw_coex_table(struct rtw_dev *rtwdev, bool force, u8 type)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_coex_stat *coex_stat = &coex->stat;
@@ -1135,9 +1135,9 @@ static void rtw_coex_power_save_state(struct rtw_dev *rtwdev, u8 ps_type, 
static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2,

			      u8 byte3, u8 byte4, u8 byte5)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u8 ps_type = COEX_PS_WIFI_NATIVE;

	bool ap_enable = false;
@@ -1193,10 +1193,10 @@ static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2, 


static void rtw_coex_tdma(struct rtw_dev *rtwdev, bool force, u32 tcase)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	u8 n, type;

	bool turn_on;
@@ -1526,8 +1526,8 @@ static u8 rtw_coex_algorithm(struct rtw_dev *rtwdev) 


static void rtw_coex_action_coex_all_off(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -1549,11 +1549,11 @@ static void rtw_coex_action_coex_all_off(struct rtw_dev *rtwdev) 


static void rtw_coex_action_freerun(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 level = 0;

	bool bt_afh_loss = true;
@@ -1594,8 +1594,8 @@ static void rtw_coex_action_freerun(struct rtw_dev *rtwdev) 


static void rtw_coex_action_rf4ce(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -1619,8 +1619,8 @@ static void rtw_coex_action_rf4ce(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_whql_test(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -1644,10 +1644,10 @@ static void rtw_coex_action_bt_whql_test(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_relink(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;

	u32 slot_type = 0;
@@ -1684,11 +1684,11 @@ static void rtw_coex_action_bt_relink(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_idle(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_rfe *coex_rfe = &coex->rfe;

	u8 table_case = 0xff, tdma_case = 0xff;
@@ -1753,10 +1753,10 @@ static void rtw_coex_action_bt_idle(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	bool wl_hi_pri = false;

	u8 table_case, tdma_case;

	u32 slot_type = 0;
@@ -1853,11 +1853,11 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_game_hid(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -1901,10 +1901,10 @@ static void rtw_coex_action_bt_game_hid(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -1932,10 +1932,10 @@ static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;

	u32 slot_type = 0;

	bool bt_multi_link_remain = false, is_toggle_table = false;
@@ -2015,11 +2015,11 @@ static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;

	u32 slot_type = 0;
@@ -2057,10 +2057,10 @@ static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_a2dpsink(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;

	bool ap_enable = false;
@@ -2096,10 +2096,10 @@ static void rtw_coex_action_bt_a2dpsink(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_pan(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -2133,11 +2133,11 @@ static void rtw_coex_action_bt_pan(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case, interval = 0;

	u32 slot_type = 0;

	bool is_toggle_table = false;
@@ -2190,10 +2190,10 @@ static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;

	bool wl_cpt_test = false, bt_cpt_test = false;
@@ -2247,10 +2247,10 @@ static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_pan_hid(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -2282,10 +2282,10 @@ static void rtw_coex_action_bt_pan_hid(struct rtw_dev *rtwdev) 


static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -2316,9 +2316,9 @@ static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev) 


static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u8 table_case, tdma_case;
@@ -2348,8 +2348,8 @@ static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev) 


static void rtw_coex_action_wl_only(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -2372,9 +2372,9 @@ static void rtw_coex_action_wl_only(struct rtw_dev *rtwdev) 


static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u8 table_case, tdma_case;
@@ -2411,10 +2411,10 @@ static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev) 


static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;

	u32 slot_type = 0;
@@ -2451,8 +2451,8 @@ static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev) 


static void rtw_coex_action_wl_not_connected(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 table_case, tdma_case;



	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__);
@@ -2528,8 +2528,8 @@ static void rtw_coex_action_wl_connected(struct rtw_dev *rtwdev) 


static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	bool rf4ce_en = false;
@@ -3002,9 +3002,9 @@ void rtw_coex_media_status_notify(struct rtw_dev *rtwdev, u8 type) 


void rtw_coex_bt_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_dm *coex_dm = &coex->dm;

	u32 bt_relink_time;

	u8 i, rsp_source = 0, type;
@@ -3270,8 +3270,8 @@ static const u8 coex_bt_hidinfo_xb[] = {0x58, 0x62, 0x6f}; 


void rtw_coex_bt_hid_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_hid *hidinfo;

	struct rtw_coex_hid_info_a *hida;
@@ -3360,8 +3360,8 @@ void rtw_coex_bt_hid_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) 


void rtw_coex_query_bt_hid_list(struct rtw_dev *rtwdev)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	struct rtw_coex_hid *hidinfo;

	u8 i, handle;
@@ -3582,7 +3582,7 @@ static const char *rtw_coex_get_reason_string(u8 reason) 
static u8 rtw_coex_get_table_index(struct rtw_dev *rtwdev, u32 wl_reg_6c0,

				   u32 wl_reg_6c4)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	u8 ans = 0xFF;

	u8 n, i;
@@ -3618,8 +3618,8 @@ static u8 rtw_coex_get_table_index(struct rtw_dev *rtwdev, u32 wl_reg_6c0, 


static u8 rtw_coex_get_tdma_index(struct rtw_dev *rtwdev, u8 *tdma_para)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	struct rtw_chip_info *chip = rtwdev->chip;

	u8 ans = 0xFF;

	u8 n, i, j;

	u8 load_cur_tab_val;
@@ -3736,7 +3736,7 @@ static int rtw_coex_val_info(struct rtw_dev *rtwdev, 


static void rtw_coex_set_coexinfo_hw(struct rtw_dev *rtwdev, struct seq_file *m)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_reg_domain *reg;

	char addr_info[INFO_SIZE];

	int n_addr = 0;
@@ -3910,7 +3910,7 @@ static const char *rtw_coex_get_wl_coex_mode(u8 coex_wl_link_mode) 


void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

drivers/net/wireless/realtek/rtw88/coex.h

+7 −7
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ struct coex_rf_para { 


static inline void rtw_coex_set_init(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	chip->ops->coex_set_init(rtwdev);

}
@@ -335,7 +335,7 @@ static inline void rtw_coex_set_init(struct rtw_dev *rtwdev) 
static inline

void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	if (!chip->ops->coex_set_ant_switch)

		return;
@@ -345,28 +345,28 @@ void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type) 


static inline void rtw_coex_set_gnt_fix(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	chip->ops->coex_set_gnt_fix(rtwdev);

}



static inline void rtw_coex_set_gnt_debug(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	chip->ops->coex_set_gnt_debug(rtwdev);

}



static inline  void rtw_coex_set_rfe_type(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	chip->ops->coex_set_rfe_type(rtwdev);

}



static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	chip->ops->coex_set_wl_tx_power(rtwdev, wl_pwr);

}
@@ -374,7 +374,7 @@ static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr) 
static inline

void rtw_coex_set_wl_rx_gain(struct rtw_dev *rtwdev, bool low_gain)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;



	chip->ops->coex_set_wl_rx_gain(rtwdev, low_gain);

}

drivers/net/wireless/realtek/rtw88/efuse.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int rtw_dump_logical_efuse_map(struct rtw_dev *rtwdev, u8 *phy_map, 


static int rtw_dump_physical_efuse_map(struct rtw_dev *rtwdev, u8 *map)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	u32 size = rtwdev->efuse.physical_size;

	u32 efuse_ctl;

	u32 addr;
@@ -145,7 +145,7 @@ EXPORT_SYMBOL(rtw_read8_physical_efuse); 


int rtw_parse_efuse_map(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_efuse *efuse = &rtwdev->efuse;

	u32 phy_size = efuse->physical_size;

	u32 log_size = efuse->logical_size;

drivers/net/wireless/realtek/rtw88/fw.c

+10 −10
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ void rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev) 
static struct sk_buff *rtw_nlo_info_get(struct ieee80211_hw *hw)

{

	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_pno_request *pno_req = &rtwdev->wow.pno_req;

	struct rtw_nlo_info_hdr *nlo_hdr;

	struct cfg80211_ssid *ssid;
@@ -959,7 +959,7 @@ static struct sk_buff *rtw_nlo_info_get(struct ieee80211_hw *hw) 
static struct sk_buff *rtw_cs_channel_info_get(struct ieee80211_hw *hw)

{

	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_pno_request *pno_req = &rtwdev->wow.pno_req;

	struct ieee80211_channel *channels = pno_req->channels;

	struct sk_buff *skb;
@@ -993,7 +993,7 @@ static struct sk_buff *rtw_cs_channel_info_get(struct ieee80211_hw *hw) 
static struct sk_buff *rtw_lps_pg_dpk_get(struct ieee80211_hw *hw)

{

	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;

	struct rtw_lps_pg_dpk_hdr *dpk_hdr;

	struct sk_buff *skb;
@@ -1018,7 +1018,7 @@ static struct sk_buff *rtw_lps_pg_dpk_get(struct ieee80211_hw *hw) 
static struct sk_buff *rtw_lps_pg_info_get(struct ieee80211_hw *hw)

{

	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct rtw_lps_conf *conf = &rtwdev->lps_conf;

	struct rtw_lps_pg_info_hdr *pg_info_hdr;

	struct rtw_wow_param *rtw_wow = &rtwdev->wow;
@@ -1122,7 +1122,7 @@ static void rtw_fill_rsvd_page_desc(struct rtw_dev *rtwdev, struct sk_buff *skb, 
				    enum rtw_rsvd_packet_type type)

{

	struct rtw_tx_pkt_info pkt_info = {0};

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	u8 *pkt_desc;



	rtw_tx_rsvd_page_pkt_info_update(rtwdev, &pkt_info, skb, type);
@@ -1433,7 +1433,7 @@ static int __rtw_build_rsvd_page_from_vifs(struct rtw_dev *rtwdev) 
static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size)

{

	struct ieee80211_hw *hw = rtwdev->hw;

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct sk_buff *iter;

	struct rtw_rsvd_page *rsvd_pkt;

	u32 page = 0;
@@ -1647,7 +1647,7 @@ static void rtw_fw_read_fifo_page(struct rtw_dev *rtwdev, u32 offset, u32 size, 
static void rtw_fw_read_fifo(struct rtw_dev *rtwdev, enum rtw_fw_fifo_sel sel,

			     u32 offset, u32 size, u32 *buf)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	u32 start_pg, residue;



	if (sel >= RTW_FW_FIFO_MAX) {
@@ -1706,7 +1706,7 @@ int rtw_fw_dump_fifo(struct rtw_dev *rtwdev, u8 fifo_sel, u32 addr, u32 size, 
static void __rtw_fw_update_pkt(struct rtw_dev *rtwdev, u8 pkt_id, u16 size,

				u8 location)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	u8 h2c_pkt[H2C_PKT_SIZE] = {0};

	u16 total_size = H2C_PKT_HDR_SIZE + H2C_PKT_UPDATE_PKT_LEN;
@@ -1818,8 +1818,8 @@ static int rtw_append_probe_req_ie(struct rtw_dev *rtwdev, struct sk_buff *skb, 
				   struct sk_buff_head *list, u8 *bands,

				   struct rtw_vif *rtwvif)

{

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct ieee80211_scan_ies *ies = rtwvif->scan_ies;

	struct rtw_chip_info *chip = rtwdev->chip;

	struct sk_buff *new;

	u8 idx;
@@ -1841,7 +1841,7 @@ static int rtw_append_probe_req_ie(struct rtw_dev *rtwdev, struct sk_buff *skb, 
static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8 num_probes,

					 struct sk_buff_head *probe_req_list)

{

	struct rtw_chip_info *chip = rtwdev->chip;

	const struct rtw_chip_info *chip = rtwdev->chip;

	struct sk_buff *skb, *tmp;

	u8 page_offset = 1, *buf, page_size = chip->page_size;

	u16 pg_addr = rtwdev->fifo.rsvd_h2c_info_addr, loc;