rtw88: remove unused member of struct rtw_hal
authorKevin Lo <kevlo@kevlo.org>
Fri, 14 Feb 2020 14:16:45 +0000 (22:16 +0800)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 12 Mar 2020 13:39:41 +0000 (15:39 +0200)
Remove unused fab_version member from struct rtw_hal.
Some of the checks being made were nonsense.

Signed-off-by: Kevin Lo <kevlo@kevlo.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtw88/main.c
drivers/net/wireless/realtek/rtw88/main.h

index 2f73820..dc93a4d 100644 (file)
@@ -1118,7 +1118,6 @@ static int rtw_chip_parameter_setup(struct rtw_dev *rtwdev)
        }
 
        hal->chip_version = rtw_read32(rtwdev, REG_SYS_CFG1);
-       hal->fab_version = BIT_GET_VENDOR_ID(hal->chip_version) >> 2;
        hal->cut_version = BIT_GET_CHIP_VER(hal->chip_version);
        hal->mp_chip = (hal->chip_version & BIT_RTL_ID) ? 0 : 1;
        if (hal->chip_version & BIT_RF_TYPE_ID) {
@@ -1133,11 +1132,6 @@ static int rtw_chip_parameter_setup(struct rtw_dev *rtwdev)
                hal->antenna_rx = BB_PATH_A;
        }
 
-       if (hal->fab_version == 2)
-               hal->fab_version = 1;
-       else if (hal->fab_version == 1)
-               hal->fab_version = 2;
-
        efuse->physical_size = chip->phy_efuse_size;
        efuse->logical_size = chip->log_efuse_size;
        efuse->protect_size = chip->ptct_efuse_size;
index c074cef..201ed88 100644 (file)
@@ -1527,7 +1527,6 @@ struct rtw_hal {
        u32 rcr;
 
        u32 chip_version;
-       u8 fab_version;
        u8 cut_version;
        u8 mp_chip;
        u8 oem_id;