Staging: rtl8723bs: fix names in rtw_rf.h

This commit converts names of structs / enums
in include/rtw_rf.h from ALL_CAPS format to lowercase

Signed-off-by: Marco Cesati <marcocesati@gmail.com>
Link: https://lore.kernel.org/r/20210317222130.29528-23-marcocesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index b46db89..586e3de 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -1039,7 +1039,7 @@ u8 PHY_GetTxPowerIndexBase(
        struct adapter *padapter,
        u8 RFPath,
        u8 Rate,
-       enum CHANNEL_WIDTH      BandWidth,
+       enum channel_width      BandWidth,
        u8 Channel,
        bool *bIn24G
 )
@@ -1556,7 +1556,7 @@ void PHY_SetTxPowerLevelByPath(struct adapter *Adapter, u8 channel, u8 path)
 void PHY_SetTxPowerIndexByRateArray(
        struct adapter *padapter,
        u8 RFPath,
-       enum CHANNEL_WIDTH BandWidth,
+       enum channel_width BandWidth,
        u8 Channel,
        u8 *Rates,
        u8 RateArraySize
@@ -1610,7 +1610,7 @@ static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel)
        return channelIndex;
 }
 
-static s16 get_bandwidth_idx(const enum CHANNEL_WIDTH bandwidth)
+static s16 get_bandwidth_idx(const enum channel_width bandwidth)
 {
        switch (bandwidth) {
        case CHANNEL_WIDTH_20:
@@ -1673,7 +1673,7 @@ static s16 get_rate_sctn_idx(const u8 rate)
 }
 
 s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
-                     enum band_type band_type, enum CHANNEL_WIDTH bandwidth,
+                     enum band_type band_type, enum channel_width bandwidth,
                      u8 rf_path, u8 data_rate, u8 channel)
 {
        s16 idx_band       = -1;

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 8554bae..aa43563 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -342,7 +342,7 @@ void rtw_hal_set_chan(struct adapter *padapter, u8 channel)
 }
 
 void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel,
-                        enum CHANNEL_WIDTH Bandwidth, u8 Offset40, u8 Offset80)
+                        enum channel_width Bandwidth, u8 Offset40, u8 Offset80)
 {
        if (padapter->HalFunc.set_chnl_bw_handler)
                padapter->HalFunc.set_chnl_bw_handler(padapter, channel,

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 9a41c18..52cb58d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -559,7 +559,7 @@ u8 PHY_GetTxPowerIndex(
        struct adapter *padapter,
        u8 RFPath,
        u8 Rate,
-       enum CHANNEL_WIDTH BandWidth,
+       enum channel_width BandWidth,
        u8 Channel
 )
 {
@@ -616,7 +616,7 @@ void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel)
 }
 
 static void phy_SetRegBW_8723B(
-       struct adapter *Adapter, enum CHANNEL_WIDTH CurrentBW
+       struct adapter *Adapter, enum channel_width CurrentBW
 )
 {
        u16 RegRfMod_BW, u2tmp = 0;
@@ -806,16 +806,16 @@ static void PHY_HandleSwChnlAndSetBW8723B(
        bool bSwitchChannel,
        bool bSetBandWidth,
        u8 ChannelNum,
-       enum CHANNEL_WIDTH ChnlWidth,
-       enum EXTCHNL_OFFSET ExtChnlOffsetOf40MHz,
-       enum EXTCHNL_OFFSET ExtChnlOffsetOf80MHz,
+       enum channel_width ChnlWidth,
+       enum extchnl_offset ExtChnlOffsetOf40MHz,
+       enum extchnl_offset ExtChnlOffsetOf80MHz,
        u8 CenterFrequencyIndex1
 )
 {
        /* static bool          bInitialzed = false; */
        struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
        u8 tmpChannel = pHalData->CurrentChannel;
-       enum CHANNEL_WIDTH tmpBW = pHalData->CurrentChannelBW;
+       enum channel_width tmpBW = pHalData->CurrentChannelBW;
        u8 tmpnCur40MhzPrimeSC = pHalData->nCur40MhzPrimeSC;
        u8 tmpnCur80MhzPrimeSC = pHalData->nCur80MhzPrimeSC;
        u8 tmpCenterFrequencyIndex1 = pHalData->CurrentCenterFrequencyIndex1;
@@ -874,7 +874,7 @@ static void PHY_HandleSwChnlAndSetBW8723B(
 
 void PHY_SetBWMode8723B(
        struct adapter *Adapter,
-       enum CHANNEL_WIDTH Bandwidth, /*  20M or 40M */
+       enum channel_width Bandwidth, /*  20M or 40M */
        unsigned char Offset /*  Upper, Lower, or Don't care */
 )
 {
@@ -892,7 +892,7 @@ void PHY_SwChnl8723B(struct adapter *Adapter, u8 channel)
 void PHY_SetSwChnlBWMode8723B(
        struct adapter *Adapter,
        u8 channel,
-       enum CHANNEL_WIDTH Bandwidth,
+       enum channel_width Bandwidth,
        u8 Offset40,
        u8 Offset80
 )

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
index aafceaf..73b47f0 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
@@ -55,7 +55,7 @@
  * Note:               For RF type 0222D
  *---------------------------------------------------------------------------*/
 void PHY_RF6052SetBandwidth8723B(
-       struct adapter *Adapter, enum CHANNEL_WIDTH Bandwidth
+       struct adapter *Adapter, enum channel_width Bandwidth
 ) /* 20M or 40M */
 {
        struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);

diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index 32fd050..979b621 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -140,7 +140,7 @@ void
 PHY_SetTxPowerIndexByRateArray(
 struct adapter *padapter,
 u8             RFPath,
-enum CHANNEL_WIDTH     BandWidth,
+enum channel_width     BandWidth,
 u8             Channel,
 u8             *Rates,
 u8             RateArraySize
@@ -172,13 +172,13 @@ PHY_GetTxPowerIndexBase(
 struct adapter *padapter,
 u8             RFPath,
 u8             Rate,
-enum CHANNEL_WIDTH     BandWidth,
+enum channel_width     BandWidth,
 u8             Channel,
        bool            *bIn24G
        );
 
 s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 RegPwrTblSel,
-                       enum band_type Band, enum CHANNEL_WIDTH Bandwidth,
+                       enum band_type Band, enum channel_width Bandwidth,
 u8             RfPath,
 u8             DataRate,
 u8             Channel

diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h
index d731cec..83a538e 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_data.h
+++ b/drivers/staging/rtl8723bs/include/hal_data.h
@@ -188,7 +188,7 @@ struct hal_com_data {
 
        /* current WIFI_PHY values */
        enum wireless_mode CurrentWirelessMode;
-       enum CHANNEL_WIDTH CurrentChannelBW;
+       enum channel_width CurrentChannelBW;
        enum band_type CurrentBandType; /* 0:2.4G, 1:5G */
        enum band_type BandSet;
        u8 CurrentChannel;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index f3be4ea..bfbf5fd 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -197,9 +197,9 @@ struct hal_ops {
        u8 (*check_ips_status)(struct adapter *padapter);
        s32             (*interrupt_handler)(struct adapter *padapter);
        void    (*clear_interrupt)(struct adapter *padapter);
-       void (*set_bwmode_handler)(struct adapter *padapter, enum CHANNEL_WIDTH Bandwidth, u8 Offset);
+       void (*set_bwmode_handler)(struct adapter *padapter, enum channel_width Bandwidth, u8 Offset);
        void (*set_channel_handler)(struct adapter *padapter, u8 channel);
-       void (*set_chnl_bw_handler)(struct adapter *padapter, u8 channel, enum CHANNEL_WIDTH Bandwidth, u8 Offset40, u8 Offset80);
+       void (*set_chnl_bw_handler)(struct adapter *padapter, u8 channel, enum channel_width Bandwidth, u8 Offset40, u8 Offset80);
 
        void (*set_tx_power_level_handler)(struct adapter *padapter, u8 channel);
        void (*get_tx_power_level_handler)(struct adapter *padapter, s32 *powerlevel);
@@ -373,7 +373,7 @@ void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32
 #define PHY_QueryMacReg PHY_QueryBBReg
 
 void rtw_hal_set_chan(struct adapter *padapter, u8 channel);
-void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel, enum CHANNEL_WIDTH Bandwidth, u8 Offset40, u8 Offset80);
+void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel, enum channel_width Bandwidth, u8 Offset40, u8 Offset80);
 void rtw_hal_dm_watchdog(struct adapter *padapter);
 void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter);
 

diff --git a/drivers/staging/rtl8723bs/include/hal_phy_cfg.h b/drivers/staging/rtl8723bs/include/hal_phy_cfg.h
index ed3488a..ea494bc 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_phy_cfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy_cfg.h
@@ -47,20 +47,20 @@ void PHY_SetTxPowerIndex(struct adapter *Adapter, u32 PowerIndex,
                         u8 RFPath, u8 Rate);
 
 u8 PHY_GetTxPowerIndex(struct adapter *padapter, u8 RFPath, u8 Rate,
-                       enum CHANNEL_WIDTH BandWidth, u8 Channel);
+                       enum channel_width BandWidth, u8 Channel);
 
 void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel);
 
 void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 channel);
 
-void PHY_SetBWMode8723B(struct adapter *Adapter, enum CHANNEL_WIDTH Bandwidth,
+void PHY_SetBWMode8723B(struct adapter *Adapter, enum channel_width Bandwidth,
                        unsigned char Offset);
 
 /*  Call after initialization */
 void PHY_SwChnl8723B(struct adapter *Adapter, u8 channel);
 
 void PHY_SetSwChnlBWMode8723B(struct adapter *Adapter, u8 channel,
-                               enum CHANNEL_WIDTH Bandwidth,
+                               enum channel_width Bandwidth,
                                u8 Offset40, u8 Offset80);
 
 /*--------------------------Exported Function prototype End---------------------*/

diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_rf.h b/drivers/staging/rtl8723bs/include/rtl8723b_rf.h
index d712c6d..525eb2f 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtl8723b_rf.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_rf.h
@@ -12,6 +12,6 @@ int   PHY_RF6052_Config8723B(struct adapter *Adapter);
 
 void
 PHY_RF6052SetBandwidth8723B(struct adapter *Adapter,
-       enum CHANNEL_WIDTH              Bandwidth);
+       enum channel_width              Bandwidth);
 
 #endif

diff --git a/drivers/staging/rtl8723bs/include/rtw_rf.h b/drivers/staging/rtl8723bs/include/rtw_rf.h
index d3a8e4b..a8ddd6f 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_rf.h
+++ b/drivers/staging/rtl8723bs/include/rtw_rf.h
@@ -49,7 +49,7 @@ struct        regulatory_class {
        u8 modem;
 };
 
-enum CAPABILITY {
+enum capability {
        cESS                    = 0x0001,
        cIBSS                   = 0x0002,
        cPollable               = 0x0004,
@@ -68,13 +68,13 @@ enum CAPABILITY {
        cImmediateBA            = 0x8000,
 };
 
-enum   _REG_PREAMBLE_MODE {
+enum   _reg_preamble_mode {
        PREAMBLE_LONG   = 1,
        PREAMBLE_AUTO   = 2,
        PREAMBLE_SHORT  = 3,
 };
 
-enum _RTL8712_RF_MIMO_CONFIG_ {
+enum _rtl8712_rf_mimo_config_ {
        RTL8712_RFCONFIG_1T = 0x10,
        RTL8712_RFCONFIG_2T = 0x20,
        RTL8712_RFCONFIG_1R = 0x01,
@@ -85,7 +85,7 @@ enum _RTL8712_RF_MIMO_CONFIG_ {
        RTL8712_RFCONFIG_2T2R = 0x22
 };
 
-enum RF90_RADIO_PATH {
+enum rf90_radio_path {
        RF90_PATH_A = 0,                /* Radio Path A */
        RF90_PATH_B = 1,                /* Radio Path B */
        RF90_PATH_C = 2,                /* Radio Path C */
@@ -98,7 +98,7 @@ enum RF90_RADIO_PATH {
 #define HAL_PRIME_CHNL_OFFSET_UPPER    2
 
 /*  Represent Channel Width in HT Capabilities */
-enum CHANNEL_WIDTH {
+enum channel_width {
        CHANNEL_WIDTH_20 = 0,
        CHANNEL_WIDTH_40 = 1,
        CHANNEL_WIDTH_80 = 2,
@@ -109,14 +109,14 @@ enum CHANNEL_WIDTH {
 
 /*  Represent Extension Channel Offset in HT Capabilities */
 /*  This is available only in 40Mhz mode. */
-enum EXTCHNL_OFFSET {
+enum extchnl_offset {
        EXTCHNL_OFFSET_NO_EXT = 0,
        EXTCHNL_OFFSET_UPPER = 1,
        EXTCHNL_OFFSET_NO_DEF = 2,
        EXTCHNL_OFFSET_LOWER = 3,
 };
 
-enum VHT_DATA_SC {
+enum vht_data_sc {
        VHT_DATA_SC_DONOT_CARE = 0,
        VHT_DATA_SC_20_UPPER_OF_80MHZ = 1,
        VHT_DATA_SC_20_LOWER_OF_80MHZ = 2,
@@ -130,14 +130,14 @@ enum VHT_DATA_SC {
        VHT_DATA_SC_40_LOWER_OF_80MHZ = 10,
 };
 
-enum PROTECTION_MODE {
+enum protection_mode {
        PROTECTION_MODE_AUTO = 0,
        PROTECTION_MODE_FORCE_ENABLE = 1,
        PROTECTION_MODE_FORCE_DISABLE = 2,
 };
 
 /* 2007/11/15 MH Define different RF type. */
-enum RT_RF_TYPE_DEFINITION {
+enum rt_rf_type_definition {
        RF_1T2R = 0,
        RF_2T4R = 1,
        RF_2T2R = 2,