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 <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20230619155203.6039-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
index f4d4b01630a2428ad3fb48be8b60dfd66e5b020a..09f8c76b7e65e675578bd5865fc0c4d3f21af8a3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
@@ -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,

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
index 65365ebe4e854956f5c068b64d45dfda95ec3723..24fb0ca539ea5080783c2521d1458b57e5e4af31 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
@@ -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

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index dbf78b60dd78790d96951f3c6fbf7c17acbd8a69..e3ce4431d460ff3ebbb0b60cfeede67822962005 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -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

diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 538cedb1dc02d2c3a59a9fa010e3e4bc8ae7b66e..e9469bfef3ddee1c5ef57fb65beee536bfad9d0f 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -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