[v2] rtw88: remove unused member of struct rtw_hal
diff mbox series

Message ID 20200214141645.GA26343@ns.kevlo.org
State Accepted
Commit 90a39326f1d15c660b5b179ad1ff0730d3036db9
Delegated to: Kalle Valo
Headers show
Series
  • [v2] rtw88: remove unused member of struct rtw_hal
Related show

Commit Message

Kevin Lo Feb. 14, 2020, 2:16 p.m. UTC
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>
---
v2: rebase on top of master
---

Comments

Kalle Valo March 12, 2020, 1:40 p.m. UTC | #1
Kevin Lo <kevlo@kevlo.org> wrote:

> 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>

Patch applied to wireless-drivers-next.git, thanks.

90a39326f1d1 rtw88: remove unused member of struct rtw_hal

Patch
diff mbox series

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 2f73820cd9ba..dc93a4d04f25 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -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;
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index c074cef22120..201ed8870754 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -1527,7 +1527,6 @@  struct rtw_hal {
 	u32 rcr;
 
 	u32 chip_version;
-	u8 fab_version;
 	u8 cut_version;
 	u8 mp_chip;
 	u8 oem_id;