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>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231023091722.52509-2-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
index 3d29c8dbb2559b6d8364e914493582d01c5b9c20..d448efe2c2298d65f824e8951a42db21d39f62d2 100644 (file)
--- 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 1f316329683632f2a1919541d03b8c8829d53b89..171a461cd8122744d8562fe2cfbdd2b506496432 100644 (file)
--- 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;
 };