Commit d1337ccb authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo

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: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231023091722.52509-2-dmantipov@yandex.ru
parent d1e6b020
...@@ -1487,12 +1487,8 @@ EXPORT_SYMBOL(rtl92c_phy_lc_calibrate); ...@@ -1487,12 +1487,8 @@ EXPORT_SYMBOL(rtl92c_phy_lc_calibrate);
void rtl92c_phy_ap_calibrate(struct ieee80211_hw *hw, s8 delta) 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)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
if (rtlphy->apk_done)
return;
if (IS_92C_SERIAL(rtlhal->version)) if (IS_92C_SERIAL(rtlhal->version))
_rtl92c_phy_ap_calibrate(hw, delta, true); _rtl92c_phy_ap_calibrate(hw, delta, true);
else else
......
...@@ -1316,7 +1316,6 @@ struct rtl_phy { ...@@ -1316,7 +1316,6 @@ struct rtl_phy {
u8 sw_chnl_stage; u8 sw_chnl_stage;
u8 sw_chnl_step; u8 sw_chnl_step;
u8 current_channel; u8 current_channel;
u8 h2c_box_num;
u8 set_io_inprogress; u8 set_io_inprogress;
u8 lck_inprogress; u8 lck_inprogress;
...@@ -1329,9 +1328,6 @@ struct rtl_phy { ...@@ -1329,9 +1328,6 @@ struct rtl_phy {
s32 reg_ebc; s32 reg_ebc;
s32 reg_ec4; s32 reg_ec4;
s32 reg_ecc; s32 reg_ecc;
u8 rfpienable;
u8 reserve_0;
u16 reserve_1;
u32 reg_c04, reg_c08, reg_874; u32 reg_c04, reg_c08, reg_874;
u32 adda_backup[16]; u32 adda_backup[16];
u32 iqk_mac_backup[IQK_MAC_REG_NUM]; u32 iqk_mac_backup[IQK_MAC_REG_NUM];
...@@ -1345,7 +1341,6 @@ struct rtl_phy { ...@@ -1345,7 +1341,6 @@ struct rtl_phy {
struct iqk_matrix_regs iqk_matrix[IQK_MATRIX_SETTINGS_NUM]; struct iqk_matrix_regs iqk_matrix[IQK_MATRIX_SETTINGS_NUM];
bool rfpi_enable; bool rfpi_enable;
bool iqk_in_progress;
u8 pwrgroup_cnt; u8 pwrgroup_cnt;
u8 cck_high_power; u8 cck_high_power;
...@@ -1383,7 +1378,6 @@ struct rtl_phy { ...@@ -1383,7 +1378,6 @@ struct rtl_phy {
[MAX_RF_PATH_NUM]; [MAX_RF_PATH_NUM];
u32 rfreg_chnlval[2]; u32 rfreg_chnlval[2];
bool apk_done;
u32 reg_rf3c[2]; /* pathA / pathB */ u32 reg_rf3c[2]; /* pathA / pathB */
u32 backup_rf_0x1a;/*92ee*/ u32 backup_rf_0x1a;/*92ee*/
...@@ -1395,7 +1389,6 @@ struct rtl_phy { ...@@ -1395,7 +1389,6 @@ struct rtl_phy {
struct phy_parameters hwparam_tables[MAX_TAB]; struct phy_parameters hwparam_tables[MAX_TAB];
u16 rf_pathmap; u16 rf_pathmap;
u8 hw_rof_enable; /*Enable GPIO[9] as WL RF HW PDn source*/
enum rt_polarity_ctl polarity_ctl; enum rt_polarity_ctl polarity_ctl;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment