linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] wifi: rtlwifi: cleanup struct rtl_hal
@ 2023-10-22 16:36 Dmitry Antipov
  2023-10-23  2:35 ` Ping-Ke Shih
  0 siblings, 1 reply; 9+ messages in thread
From: Dmitry Antipov @ 2023-10-22 16:36 UTC (permalink / raw)
  To: Ping-Ke Shih; +Cc: Kalle Valo, linux-wireless, Dmitry Antipov

Remove unused and set but otherwise unused 'bbrf_ready', 'external_pa',
'pa_mode', 'rx_tag', 'rts_en', 'wow_enable', 'wow_enabled' and
'hw_rof_enable' (which seems to be an erroneous duplication of the same
one of 'struct rtl_phy') fields of 'struct rtl_hal', adjust related
code. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c |  7 -------
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c |  1 -
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c |  9 +++++----
 drivers/net/wireless/realtek/rtlwifi/wifi.h         | 10 ----------
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
index 5a828a934fe9..fad132512a20 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
@@ -432,10 +432,8 @@ static void rtl92ee_dm_check_rssi_monitor(struct ieee80211_hw *hw)
 static void rtl92ee_dm_init_primary_cca_check(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 	struct dynamic_primary_cca *primarycca = &rtlpriv->primarycca;
 
-	rtlhal->rts_en = 0;
 	primarycca->dup_rts_flag = 0;
 	primarycca->intf_flag = 0;
 	primarycca->intf_type = 0;
@@ -615,13 +613,11 @@ static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
 				primarycca->pricca_flag = 1;
 				primarycca->dup_rts_flag = 1;
-				rtlpriv->rtlhal.rts_en = 1;
 			} else {
 				primarycca->intf_type = 0;
 				primarycca->intf_flag = 0;
 				cur_mf_state = MF_USC_LSC;
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
-				rtlpriv->rtlhal.rts_en = 0;
 				primarycca->dup_rts_flag = 0;
 			}
 		} else if (sec_ch_offset == 1) {
@@ -642,13 +638,11 @@ static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
 				primarycca->pricca_flag = 1;
 				primarycca->dup_rts_flag = 1;
-				rtlpriv->rtlhal.rts_en = 1;
 			} else {
 				primarycca->intf_type = 0;
 				primarycca->intf_flag = 0;
 				cur_mf_state = MF_USC_LSC;
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
-				rtlpriv->rtlhal.rts_en = 0;
 				primarycca->dup_rts_flag = 0;
 			}
 		}
@@ -660,7 +654,6 @@ static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
 			cur_mf_state = MF_USC_LSC;
 			/* default */
 			rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
-			rtlpriv->rtlhal.rts_en = 0;
 			primarycca->dup_rts_flag = 0;
 			primarycca->intf_type = 0;
 			primarycca->intf_flag = 0;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
index ebb7abd0c9ad..d4da5cdc8414 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
@@ -1320,7 +1320,6 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw)
 		err = 1;
 		return err;
 	}
-	rtlhal->rx_tag = 0;
 	rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, 0x8000);
 	err = rtl92ee_download_fw(hw, false);
 	if (err) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index 1633328bc3d1..da77069545a6 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -1705,7 +1705,7 @@ static void _rtl8821ae_enable_ltr(struct ieee80211_hw *hw)
 static bool _rtl8821ae_wowlan_initialize_adapter(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+	struct rtl_phy *rtlphy = &rtlpriv->phy;
 	bool init_finished = true;
 	u8 tmp = 0;
 
@@ -1735,7 +1735,7 @@ static bool _rtl8821ae_wowlan_initialize_adapter(struct ieee80211_hw *hw)
 	rtl8821ae_set_fw_wowlan_mode(hw, false);
 	rtl8821ae_set_fw_remote_wake_ctrl_cmd(hw, 0);
 
-	if (rtlhal->hw_rof_enable) {
+	if (rtlphy->hw_rof_enable) {
 		tmp = rtl_read_byte(rtlpriv, REG_HSISR + 3);
 		if (tmp & BIT(1)) {
 			/* Clear GPIO9 ISR */
@@ -2042,7 +2042,7 @@ static enum version_8821ae _rtl8821ae_read_chip_version(struct ieee80211_hw *hw)
 	if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) {
 		/*WL_HWROF_EN.*/
 		value32 = rtl_read_dword(rtlpriv, REG_MULTI_FUNC_CTRL);
-		rtlhal->hw_rof_enable = ((value32 & WL_HWROF_EN) ? 1 : 0);
+		rtlphy->hw_rof_enable = ((value32 & WL_HWROF_EN) ? 1 : 0);
 	}
 
 	switch (version) {
@@ -2340,6 +2340,7 @@ void rtl8821ae_card_disable(struct ieee80211_hw *hw)
 	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 	struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
 	struct rtl_mac *mac = rtl_mac(rtlpriv);
+	struct rtl_phy *rtlphy = &rtlpriv->phy;
 	enum nl80211_iftype opmode;
 	bool support_remote_wakeup;
 	u8 tmp;
@@ -2449,7 +2450,7 @@ void rtl8821ae_card_disable(struct ieee80211_hw *hw)
 			"Wait Tx DMA Finished before host sleep. count=%d\n",
 			count);
 
-		if (rtlhal->hw_rof_enable) {
+		if (rtlphy->hw_rof_enable) {
 			printk("hw_rof_enable\n");
 			tmp = rtl_read_byte(rtlpriv, REG_HSISR + 3);
 			rtl_write_byte(rtlpriv, REG_HSISR + 3, tmp | BIT(1));
diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 31a481f43a07..3a837d62eda1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -1610,7 +1610,6 @@ struct rtl_hal {
 	bool up_first_time;
 	bool first_init;
 	bool being_init_adapter;
-	bool bbrf_ready;
 	bool mac_func_enable;
 	bool pre_edcca_enable;
 	struct bt_coexist_8723 hal_coex_8723;
@@ -1623,9 +1622,7 @@ struct rtl_hal {
 	u8 state;		/*stop 0, start 1 */
 	u8 board_type;
 	u8 package_type;
-	u8 external_pa;
 
-	u8 pa_mode;
 	u8 pa_type_2g;
 	u8 pa_type_5g;
 	u8 lna_type_2g;
@@ -1691,20 +1688,13 @@ struct rtl_hal {
 	bool master_of_dmsp;
 	bool slave_of_dmsp;
 
-	u16 rx_tag;/*for 92ee*/
-	u8 rts_en;
-
 	/*for wowlan*/
-	bool wow_enable;
 	bool enter_pnp_sleep;
 	bool wake_from_pnp_sleep;
-	bool wow_enabled;
 	time64_t last_suspend_sec;
 	u32 wowlan_fwsize;
 	u8 *wowlan_firmware;
 
-	u8 hw_rof_enable; /*Enable GPIO[9] as WL RF HW PDn source*/
-
 	bool real_wow_v2_enable;
 	bool re_init_llt_table;
 };
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* RE: [PATCH] wifi: rtlwifi: cleanup struct rtl_hal
  2023-10-22 16:36 [PATCH] wifi: rtlwifi: cleanup struct rtl_hal Dmitry Antipov
@ 2023-10-23  2:35 ` Ping-Ke Shih
  2023-10-23  9:17   ` [PATCH 1/3] [v2] " Dmitry Antipov
  0 siblings, 1 reply; 9+ messages in thread
From: Ping-Ke Shih @ 2023-10-23  2:35 UTC (permalink / raw)
  To: Dmitry Antipov; +Cc: Kalle Valo, linux-wireless@vger.kernel.org



> -----Original Message-----
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Sent: Monday, October 23, 2023 12:36 AM
> To: Ping-Ke Shih <pkshih@realtek.com>
> Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; Dmitry Antipov <dmantipov@yandex.ru>
> Subject: [PATCH] wifi: rtlwifi: cleanup struct rtl_hal
> 
> Remove unused and set but otherwise unused 'bbrf_ready', 'external_pa',
> 'pa_mode', 'rx_tag', 'rts_en', 'wow_enable', 'wow_enabled' and
> 'hw_rof_enable' (which seems to be an erroneous duplication of the same
> one of 'struct rtl_phy') fields of 'struct rtl_hal', adjust related
> code.

Why not removing 'hw_rof_enable' from 'struct rtl_phy'? Then, this patch can
be _purely_ cleanup unused code. 

Ping-Ke


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal
  2023-10-23  2:35 ` Ping-Ke Shih
@ 2023-10-23  9:17   ` Dmitry Antipov
  2023-10-23  9:17     ` [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy Dmitry Antipov
                       ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Dmitry Antipov @ 2023-10-23  9:17 UTC (permalink / raw)
  To: Ping-Ke Shih; +Cc: Kalle Valo, linux-wireless, Dmitry Antipov

Remove unused and set but otherwise unused 'bbrf_ready', 'external_pa',
'pa_mode', 'rx_tag', 'rts_en', 'wow_enable' and 'wow_enabled' fields
of 'struct rtl_hal', adjust related code. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v2: preserve 'hw_rof_enable' (Ping-Ke Shih) and start the series
---
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 7 -------
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 1 -
 drivers/net/wireless/realtek/rtlwifi/wifi.h         | 8 --------
 3 files changed, 16 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
index 5a828a934fe9..fad132512a20 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
@@ -432,10 +432,8 @@ static void rtl92ee_dm_check_rssi_monitor(struct ieee80211_hw *hw)
 static void rtl92ee_dm_init_primary_cca_check(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 	struct dynamic_primary_cca *primarycca = &rtlpriv->primarycca;
 
-	rtlhal->rts_en = 0;
 	primarycca->dup_rts_flag = 0;
 	primarycca->intf_flag = 0;
 	primarycca->intf_type = 0;
@@ -615,13 +613,11 @@ static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
 				primarycca->pricca_flag = 1;
 				primarycca->dup_rts_flag = 1;
-				rtlpriv->rtlhal.rts_en = 1;
 			} else {
 				primarycca->intf_type = 0;
 				primarycca->intf_flag = 0;
 				cur_mf_state = MF_USC_LSC;
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
-				rtlpriv->rtlhal.rts_en = 0;
 				primarycca->dup_rts_flag = 0;
 			}
 		} else if (sec_ch_offset == 1) {
@@ -642,13 +638,11 @@ static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
 				primarycca->pricca_flag = 1;
 				primarycca->dup_rts_flag = 1;
-				rtlpriv->rtlhal.rts_en = 1;
 			} else {
 				primarycca->intf_type = 0;
 				primarycca->intf_flag = 0;
 				cur_mf_state = MF_USC_LSC;
 				rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
-				rtlpriv->rtlhal.rts_en = 0;
 				primarycca->dup_rts_flag = 0;
 			}
 		}
@@ -660,7 +654,6 @@ static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
 			cur_mf_state = MF_USC_LSC;
 			/* default */
 			rtl92ee_dm_write_dynamic_cca(hw, cur_mf_state);
-			rtlpriv->rtlhal.rts_en = 0;
 			primarycca->dup_rts_flag = 0;
 			primarycca->intf_type = 0;
 			primarycca->intf_flag = 0;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
index ebb7abd0c9ad..d4da5cdc8414 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
@@ -1320,7 +1320,6 @@ int rtl92ee_hw_init(struct ieee80211_hw *hw)
 		err = 1;
 		return err;
 	}
-	rtlhal->rx_tag = 0;
 	rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, 0x8000);
 	err = rtl92ee_download_fw(hw, false);
 	if (err) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 31a481f43a07..1f3163296836 100644
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -1610,7 +1610,6 @@ struct rtl_hal {
 	bool up_first_time;
 	bool first_init;
 	bool being_init_adapter;
-	bool bbrf_ready;
 	bool mac_func_enable;
 	bool pre_edcca_enable;
 	struct bt_coexist_8723 hal_coex_8723;
@@ -1623,9 +1622,7 @@ struct rtl_hal {
 	u8 state;		/*stop 0, start 1 */
 	u8 board_type;
 	u8 package_type;
-	u8 external_pa;
 
-	u8 pa_mode;
 	u8 pa_type_2g;
 	u8 pa_type_5g;
 	u8 lna_type_2g;
@@ -1691,14 +1688,9 @@ struct rtl_hal {
 	bool master_of_dmsp;
 	bool slave_of_dmsp;
 
-	u16 rx_tag;/*for 92ee*/
-	u8 rts_en;
-
 	/*for wowlan*/
-	bool wow_enable;
 	bool enter_pnp_sleep;
 	bool wake_from_pnp_sleep;
-	bool wow_enabled;
 	time64_t last_suspend_sec;
 	u32 wowlan_fwsize;
 	u8 *wowlan_firmware;
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy
  2023-10-23  9:17   ` [PATCH 1/3] [v2] " Dmitry Antipov
@ 2023-10-23  9:17     ` Dmitry Antipov
  2023-10-24  1:56       ` Ping-Ke Shih
  2023-10-23  9:17     ` [PATCH 3/3] [v2] wifi: rtlwifi: typo fix Dmitry Antipov
                       ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Dmitry Antipov @ 2023-10-23  9:17 UTC (permalink / raw)
  To: Ping-Ke Shih; +Cc: Kalle Valo, linux-wireless, Dmitry Antipov

Remove unused and read by otherwise unused 'h2c_box_num',
'rfpienable', 'reserve_0', 'reserve_1', 'iqk_in_progress',
'apk_done' and 'hw_rof_enable' fields of 'struct rtl_phy',
adjust related code. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v2: split to not mix with 'struct rtl_hal' changes
---
 drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 4 ----
 drivers/net/wireless/realtek/rtlwifi/wifi.h                | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
index 3d29c8dbb255..d448efe2c229 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
@@ -1487,12 +1487,8 @@ EXPORT_SYMBOL(rtl92c_phy_lc_calibrate);
 
 void rtl92c_phy_ap_calibrate(struct ieee80211_hw *hw, s8 delta)
 {
-	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_phy *rtlphy = &(rtlpriv->phy);
 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-	if (rtlphy->apk_done)
-		return;
 	if (IS_92C_SERIAL(rtlhal->version))
 		_rtl92c_phy_ap_calibrate(hw, delta, true);
 	else
diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 1f3163296836..171a461cd812 100644
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -1316,7 +1316,6 @@ struct rtl_phy {
 	u8 sw_chnl_stage;
 	u8 sw_chnl_step;
 	u8 current_channel;
-	u8 h2c_box_num;
 	u8 set_io_inprogress;
 	u8 lck_inprogress;
 
@@ -1329,9 +1328,6 @@ struct rtl_phy {
 	s32 reg_ebc;
 	s32 reg_ec4;
 	s32 reg_ecc;
-	u8 rfpienable;
-	u8 reserve_0;
-	u16 reserve_1;
 	u32 reg_c04, reg_c08, reg_874;
 	u32 adda_backup[16];
 	u32 iqk_mac_backup[IQK_MAC_REG_NUM];
@@ -1345,7 +1341,6 @@ struct rtl_phy {
 	struct iqk_matrix_regs iqk_matrix[IQK_MATRIX_SETTINGS_NUM];
 
 	bool rfpi_enable;
-	bool iqk_in_progress;
 
 	u8 pwrgroup_cnt;
 	u8 cck_high_power;
@@ -1383,7 +1378,6 @@ struct rtl_phy {
 			 [MAX_RF_PATH_NUM];
 
 	u32 rfreg_chnlval[2];
-	bool apk_done;
 	u32 reg_rf3c[2];	/* pathA / pathB  */
 
 	u32 backup_rf_0x1a;/*92ee*/
@@ -1395,7 +1389,6 @@ struct rtl_phy {
 	struct phy_parameters hwparam_tables[MAX_TAB];
 	u16 rf_pathmap;
 
-	u8 hw_rof_enable; /*Enable GPIO[9] as WL RF HW PDn source*/
 	enum rt_polarity_ctl polarity_ctl;
 };
 
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 3/3] [v2] wifi: rtlwifi: typo fix
  2023-10-23  9:17   ` [PATCH 1/3] [v2] " Dmitry Antipov
  2023-10-23  9:17     ` [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy Dmitry Antipov
@ 2023-10-23  9:17     ` Dmitry Antipov
  2023-10-24  1:59       ` Ping-Ke Shih
  2023-10-24  1:55     ` [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal Ping-Ke Shih
  2023-10-30 17:21     ` Kalle Valo
  3 siblings, 1 reply; 9+ messages in thread
From: Dmitry Antipov @ 2023-10-23  9:17 UTC (permalink / raw)
  To: Ping-Ke Shih; +Cc: Kalle Valo, linux-wireless, Dmitry Antipov

For rtl8192ee, change 'rtl92ee_dm_dynamic_primary_cca_ckeck()'
to 'rtl92ee_dm_dynamic_primary_cca_check()' and so adjust
'rtl92ee_dm_watchdog()' as well. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v2: join the series
---
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
index fad132512a20..17486e3f322c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
@@ -560,7 +560,7 @@ static void rtl92ee_dm_write_dynamic_cca(struct ieee80211_hw *hw,
 	primarycca->mf_state = cur_mf_state;
 }
 
-static void rtl92ee_dm_dynamic_primary_cca_ckeck(struct ieee80211_hw *hw)
+static void rtl92ee_dm_dynamic_primary_cca_check(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
@@ -1083,7 +1083,7 @@ void rtl92ee_dm_watchdog(struct ieee80211_hw *hw)
 		rtl92ee_dm_refresh_rate_adaptive_mask(hw);
 		rtl92ee_dm_check_edca_turbo(hw);
 		rtl92ee_dm_dynamic_atc_switch(hw);
-		rtl92ee_dm_dynamic_primary_cca_ckeck(hw);
+		rtl92ee_dm_dynamic_primary_cca_check(hw);
 	}
 	spin_unlock(&rtlpriv->locks.rf_ps_lock);
 }
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* RE: [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal
  2023-10-23  9:17   ` [PATCH 1/3] [v2] " Dmitry Antipov
  2023-10-23  9:17     ` [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy Dmitry Antipov
  2023-10-23  9:17     ` [PATCH 3/3] [v2] wifi: rtlwifi: typo fix Dmitry Antipov
@ 2023-10-24  1:55     ` Ping-Ke Shih
  2023-10-30 17:21     ` Kalle Valo
  3 siblings, 0 replies; 9+ messages in thread
From: Ping-Ke Shih @ 2023-10-24  1:55 UTC (permalink / raw)
  To: Dmitry Antipov; +Cc: Kalle Valo, linux-wireless@vger.kernel.org



> -----Original Message-----
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Sent: Monday, October 23, 2023 5:17 PM
> To: Ping-Ke Shih <pkshih@realtek.com>
> Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; Dmitry Antipov <dmantipov@yandex.ru>
> Subject: [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal
> 
> Remove unused and set but otherwise unused 'bbrf_ready', 'external_pa',
> 'pa_mode', 'rx_tag', 'rts_en', 'wow_enable' and 'wow_enabled' fields
> of 'struct rtl_hal', adjust related code. Compile tested only.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>


^ permalink raw reply	[flat|nested] 9+ messages in thread

* RE: [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy
  2023-10-23  9:17     ` [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy Dmitry Antipov
@ 2023-10-24  1:56       ` Ping-Ke Shih
  0 siblings, 0 replies; 9+ messages in thread
From: Ping-Ke Shih @ 2023-10-24  1:56 UTC (permalink / raw)
  To: Dmitry Antipov; +Cc: Kalle Valo, linux-wireless@vger.kernel.org



> -----Original Message-----
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Sent: Monday, October 23, 2023 5:17 PM
> To: Ping-Ke Shih <pkshih@realtek.com>
> Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; Dmitry Antipov <dmantipov@yandex.ru>
> Subject: [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy
> 
> Remove unused and read by otherwise unused 'h2c_box_num',
> 'rfpienable', 'reserve_0', 'reserve_1', 'iqk_in_progress',
> 'apk_done' and 'hw_rof_enable' fields of 'struct rtl_phy',
> adjust related code. Compile tested only.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>



^ permalink raw reply	[flat|nested] 9+ messages in thread

* RE: [PATCH 3/3] [v2] wifi: rtlwifi: typo fix
  2023-10-23  9:17     ` [PATCH 3/3] [v2] wifi: rtlwifi: typo fix Dmitry Antipov
@ 2023-10-24  1:59       ` Ping-Ke Shih
  0 siblings, 0 replies; 9+ messages in thread
From: Ping-Ke Shih @ 2023-10-24  1:59 UTC (permalink / raw)
  To: Dmitry Antipov; +Cc: Kalle Valo, linux-wireless@vger.kernel.org



> -----Original Message-----
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Sent: Monday, October 23, 2023 5:17 PM
> To: Ping-Ke Shih <pkshih@realtek.com>
> Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; Dmitry Antipov <dmantipov@yandex.ru>
> Subject: [PATCH 3/3] [v2] wifi: rtlwifi: typo fix

Though this patch is just to fix typo, it would be better to point out what you are fixing. 

> 
> For rtl8192ee, change 'rtl92ee_dm_dynamic_primary_cca_ckeck()'
> to 'rtl92ee_dm_dynamic_primary_cca_check()' and so adjust
> 'rtl92ee_dm_watchdog()' as well. Compile tested only.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal
  2023-10-23  9:17   ` [PATCH 1/3] [v2] " Dmitry Antipov
                       ` (2 preceding siblings ...)
  2023-10-24  1:55     ` [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal Ping-Ke Shih
@ 2023-10-30 17:21     ` Kalle Valo
  3 siblings, 0 replies; 9+ messages in thread
From: Kalle Valo @ 2023-10-30 17:21 UTC (permalink / raw)
  To: Dmitry Antipov; +Cc: Ping-Ke Shih, linux-wireless, Dmitry Antipov

Dmitry Antipov <dmantipov@yandex.ru> wrote:

> Remove unused and set but otherwise unused 'bbrf_ready', 'external_pa',
> 'pa_mode', 'rx_tag', 'rts_en', 'wow_enable' and 'wow_enabled' fields
> of 'struct rtl_hal', adjust related code. Compile tested only.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>

3 patches applied to wireless-next.git, thanks.

d1e6b020c32d wifi: rtlwifi: cleanup struct rtl_hal
d1337ccb4477 wifi: rtlwifi: cleanup struct rtl_phy
7419d8ab3508 wifi: rtlwifi: rtl92ee_dm_dynamic_primary_cca_check(): fix typo in function name

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20231023091722.52509-1-dmantipov@yandex.ru/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-10-30 17:21 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-22 16:36 [PATCH] wifi: rtlwifi: cleanup struct rtl_hal Dmitry Antipov
2023-10-23  2:35 ` Ping-Ke Shih
2023-10-23  9:17   ` [PATCH 1/3] [v2] " Dmitry Antipov
2023-10-23  9:17     ` [PATCH 2/3] [v2] wifi: rtlwifi: cleanup struct rtl_phy Dmitry Antipov
2023-10-24  1:56       ` Ping-Ke Shih
2023-10-23  9:17     ` [PATCH 3/3] [v2] wifi: rtlwifi: typo fix Dmitry Antipov
2023-10-24  1:59       ` Ping-Ke Shih
2023-10-24  1:55     ` [PATCH 1/3] [v2] wifi: rtlwifi: cleanup struct rtl_hal Ping-Ke Shih
2023-10-30 17:21     ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).