staging: r8188eu: remove enum odm_bw

The enums odm_bw and ht_channel_width are redundant. Keep
ht_channel_width and remove odm_bw.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220220100212.7466-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 6f594ae33c6ef8a5d9f7b735cfadc2032ebfbba4..5d2f934d78ae687ebf532c15385bd59816f058d8 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -266,7 +266,7 @@ static void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm)
        u8 i;
        struct sta_info *pEntry;
 
-       if (*pDM_Odm->pBandWidth == ODM_BW40M) {
+       if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40) {
                if (*pDM_Odm->pSecChOffset == 1)
                        pDM_Odm->ControlChannel = *pDM_Odm->pChannel - 2;
                else if (*pDM_Odm->pSecChOffset == 2)
@@ -766,7 +766,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u
                } else if (rssi_level == DM_RATR_STA_MIDDLE) {
                        rate_bitmap = 0x000ff000;
                } else {
-                       if (*pDM_Odm->pBandWidth == ODM_BW40M)
+                       if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40)
                                rate_bitmap = 0x000ff015;
                        else
                                rate_bitmap = 0x000ff005;

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 2f9e241de5c43da87981bbb2c6308a80aadd74e2..1150c7d25ef5d2b4009f90a559731c13a58da892 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -164,12 +164,6 @@ enum odm_wireless_mode {
        ODM_WM_AUTO     = BIT(5),
 };
 
-/*  ODM_CMNINFO_BW */
-enum odm_bw {
-       ODM_BW20M               = 0,
-       ODM_BW40M               = 1,
-};
-
 struct odm_ra_info {
        u8 RateID;
        u32 RateMask;