staging: rtl8192e: remove 5G related code

PATCH In review Michael Straube 2 participants 2 messages Jun 19, 2023 Staging

Share & tools

Michael Straube

author

2023-06-19 15:52 UTC #0 lore raw

PATCH 1/1 staging: rtl8192e: remove 5G related code

In previous patches we removed 5G code since the hardware that uses this driver does not support 5G. There is still some 5G related code, remove it. All the removed defines are unused and we can safely remove "N-5G" from the rtllib_modes array.

Signed-off-by Michael Straube <[email protected]>

---
Compile-tested only, due to lack of hardware.

 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h     | 1 -
 drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 2 --
 drivers/staging/rtl8192e/rtllib.h                 | 1 -
 drivers/staging/rtl8192e/rtllib_wx.c              | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +0 -1

index f4d4b01630a2..09f8c76b7e65 100644
@@ -159,7 +159,6 @@ enum _RTL8192PCI_HW {
 	WFCRC2		  = 0x2f8,
 
 	BW_OPMODE		= 0x300,
-#define	BW_OPMODE_5G			BIT1
 #define	BW_OPMODE_20MHZ			BIT2
 	IC_VERRSION		= 0x301,
 	MSR			= 0x303,

drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h +0 -2

index 65365ebe4e85..24fb0ca539ea 100644
@@ -266,7 +266,6 @@
 #define b3WireAddressLength		0x400
 #define b3WireRFPowerDown		0x1
 /*#define bHWSISelect			0x8 */
-#define b5GPAPEPolarity			0x40000000
 #define b2GPAPEPolarity			0x80000000
 #define bRFSW_TxDefaultAnt		0x3
 #define bRFSW_TxOptionAnt		0x30

@@ -284,7 +283,6 @@
 #define bRFSI_ANTSW			0x100
 #define bRFSI_ANTSWB			0x200
 #define bRFSI_PAPE			0x400
-#define bRFSI_PAPE5G			0x800
 #define bBandSelect			0x1
 #define bHTSIG2_GI			0x80
 #define bHTSIG2_Smoothing		0x01

drivers/staging/rtl8192e/rtllib.h +0 -1

index dbf78b60dd78..e3ce4431d460 100644
@@ -427,7 +427,6 @@ enum wireless_mode {
 	WIRELESS_MODE_G = 0x04,
 	WIRELESS_MODE_AUTO = 0x08,
 	WIRELESS_MODE_N_24G = 0x10,
-	WIRELESS_MODE_N_5G = 0x20
 };
 
 #ifndef ETH_P_PAE

drivers/staging/rtl8192e/rtllib_wx.c +1 -1

index 538cedb1dc02..e9469bfef3dd 100644
@@ -19,7 +19,7 @@
 #include "rtllib.h"
 
 static const char * const rtllib_modes[] = {
-	"a", "b", "g", "?", "N-24G", "N-5G"
+	"a", "b", "g", "?", "N-24G"
 };
 
 #define MAX_CUSTOM_LEN 64

Signature · 1 line

2.41.0

Philipp Hortmann

Tested-by on v1 1/1

2023-06-19 20:04 UTC #1 lore raw

Quoted 64 lines · Michael Straube

Signed-off-by Michael Straube <[email protected]>

---
Compile-tested only, due to lack of hardware.

  drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h     | 1 -
  drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 2 --
  drivers/staging/rtl8192e/rtllib.h                 | 1 -
  drivers/staging/rtl8192e/rtllib_wx.c              | 2 +-
  4 files changed, 1 insertion(+), 5 deletions(-)

drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +0 -1

index f4d4b01630a2..09f8c76b7e65 100644
@@ -159,7 +159,6 @@ enum _RTL8192PCI_HW {
  	WFCRC2		  = 0x2f8,
 
  	BW_OPMODE		= 0x300,
-#define	BW_OPMODE_5G			BIT1
  #define	BW_OPMODE_20MHZ			BIT2
  	IC_VERRSION		= 0x301,
  	MSR			= 0x303,

drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h +0 -2

index 65365ebe4e85..24fb0ca539ea 100644
@@ -266,7 +266,6 @@
  #define b3WireAddressLength		0x400
  #define b3WireRFPowerDown		0x1
  /*#define bHWSISelect			0x8 */
-#define b5GPAPEPolarity			0x40000000
  #define b2GPAPEPolarity			0x80000000
  #define bRFSW_TxDefaultAnt		0x3
  #define bRFSW_TxOptionAnt		0x30

@@ -284,7 +283,6 @@
  #define bRFSI_ANTSW			0x100
  #define bRFSI_ANTSWB			0x200
  #define bRFSI_PAPE			0x400
-#define bRFSI_PAPE5G			0x800
  #define bBandSelect			0x1
  #define bHTSIG2_GI			0x80
  #define bHTSIG2_Smoothing		0x01

drivers/staging/rtl8192e/rtllib.h +0 -1

index dbf78b60dd78..e3ce4431d460 100644
@@ -427,7 +427,6 @@ enum wireless_mode {
  	WIRELESS_MODE_G = 0x04,
  	WIRELESS_MODE_AUTO = 0x08,
  	WIRELESS_MODE_N_24G = 0x10,
-	WIRELESS_MODE_N_5G = 0x20
  };
 
  #ifndef ETH_P_PAE

drivers/staging/rtl8192e/rtllib_wx.c +0 -0

index 538cedb1dc02..e9469bfef3dd 100644

drivers/staging/rtl8192e/rtllib_wx.c line 25

Quoted 8 lines

drivers/staging/rtl8192e/rtllib_wx.c +1 -1

@@ -19,7 +19,7 @@
  #include "rtllib.h"
 
  static const char * const rtllib_modes[] = {
-	"a", "b", "g", "?", "N-24G", "N-5G"
+	"a", "b", "g", "?", "N-24G"
  };
 
  #define MAX_CUSTOM_LEN 64

Tested-by Philipp Hortmann <[email protected]>