rtw88: remove unneeded variable
diff mbox series

Message ID 20200213052000.GA15671@ns.kevlo.org
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series
  • rtw88: remove unneeded variable
Related show

Commit Message

Kevin Lo Feb. 13, 2020, 5:20 a.m. UTC
Remove unneeded fab_version variable in rtw_chip_parameter_setup().
Some of the checks being made were nonsense.

Signed-off-by: Kevin Lo <kevlo@kevlo.org>
---

Comments

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

> Remove unneeded fab_version variable in rtw_chip_parameter_setup().
> Some of the checks being made were nonsense.
> 
> Signed-off-by: Kevin Lo <kevlo@kevlo.org>
> 
> diff d49f2c5063fdd00f896e408a1c1fa63e6d94a767 /home/kevlo/wireless-drivers-next
> blob - 2f73820cd9ba542ebb632267a9460ea87ddcc2a5
> file + drivers/net/wireless/realtek/rtw88/main.c
> --- drivers/net/wireless/realtek/rtw88/main.c
> +++ drivers/net/wireless/realtek/rtw88/main.c
> @@ -1118,7 +1118,6 @@ static int rtw_chip_parameter_setup(struct rtw_dev *rt
>  	}
>  
>  	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) {
> @@ -1132,11 +1131,6 @@ static int rtw_chip_parameter_setup(struct rtw_dev *rt
>  		hal->antenna_tx = BB_PATH_A;
>  		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;
> blob - c074cef22120a222948cfab03ca0bd25baa80844
> file + drivers/net/wireless/realtek/rtw88/main.h
> --- drivers/net/wireless/realtek/rtw88/main.h
> +++ 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;

Failed to apply, please rebase on top of wireless-drivers-next.

fatal: sha1 information is lacking or useless (net/wireless/realtek/rtw88/main.c).
error: could not build fake ancestor
Applying: rtw88: remove unneeded variable
Patch failed at 0001 rtw88: remove unneeded variable
The copy of the patch that failed is found in: .git/rebase-apply/patch

Patch set to Changes Requested.

Patch
diff mbox series

diff d49f2c5063fdd00f896e408a1c1fa63e6d94a767 /home/kevlo/wireless-drivers-next
blob - 2f73820cd9ba542ebb632267a9460ea87ddcc2a5
file + drivers/net/wireless/realtek/rtw88/main.c
--- drivers/net/wireless/realtek/rtw88/main.c
+++ drivers/net/wireless/realtek/rtw88/main.c
@@ -1118,7 +1118,6 @@  static int rtw_chip_parameter_setup(struct rtw_dev *rt
 	}
 
 	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) {
@@ -1132,11 +1131,6 @@  static int rtw_chip_parameter_setup(struct rtw_dev *rt
 		hal->antenna_tx = BB_PATH_A;
 		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;
blob - c074cef22120a222948cfab03ca0bd25baa80844
file + drivers/net/wireless/realtek/rtw88/main.h
--- drivers/net/wireless/realtek/rtw88/main.h
+++ 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;