Staging: rtl8723bs: fix names in HalVerDef.h

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

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

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 32e6b82333415fc63fc16027de3d013ceb17a820..1e66f749fd40c8c0659ef0a9150f485d8ee7c583 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -38,7 +38,7 @@ void rtw_hal_data_deinit(struct adapter *padapter)
 }
 
 
-void dump_chip_info(struct HAL_VERSION ChipVersion)
+void dump_chip_info(struct hal_version ChipVersion)
 {
        char buf[128];
        size_t cnt = 0;

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 9c30024fa984a8705c92996e9407acfe5b23e9bd..44bbffab0c02bfa42596800e9c11ac59934d5ff5 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1872,10 +1872,10 @@ static bool Hal_EfusePgPacketWrite_BT(
        return true;
 }
 
-static struct HAL_VERSION ReadChipVersion8723B(struct adapter *padapter)
+static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
 {
        u32 value32;
-       struct HAL_VERSION ChipVersion;
+       struct hal_version ChipVersion;
        struct hal_com_data *pHalData;
 
 /* YJ, TODO, move read chip type here */

diff --git a/drivers/staging/rtl8723bs/include/HalVerDef.h b/drivers/staging/rtl8723bs/include/HalVerDef.h
index 11055147a2a2eaa43e71980988f7ed1f91db32c1..bab226f77b24cf4e930bbd4dc6634162d444db66 100644 (file)
--- a/drivers/staging/rtl8723bs/include/HalVerDef.h
+++ b/drivers/staging/rtl8723bs/include/HalVerDef.h
@@ -7,8 +7,8 @@
 #ifndef __HAL_VERSION_DEF_H__
 #define __HAL_VERSION_DEF_H__
 
-/*  HAL_IC_TYPE_E */
-enum HAL_IC_TYPE_E { /* tag_HAL_IC_Type_Definition */
+/*  hal_ic_type_e */
+enum hal_ic_type_e { /* tag_HAL_IC_Type_Definition */
        CHIP_8192S      =       0,
        CHIP_8188C      =       1,
        CHIP_8192C      =       2,
@@ -21,15 +21,15 @@ enum HAL_IC_TYPE_E { /* tag_HAL_IC_Type_Definition */
        CHIP_8192E      =       9,
 };
 
-/* HAL_CHIP_TYPE_E */
-enum HAL_CHIP_TYPE_E { /* tag_HAL_CHIP_Type_Definition */
+/* hal_chip_type_e */
+enum hal_chip_type_e { /* tag_HAL_CHIP_Type_Definition */
        TEST_CHIP               =       0,
        NORMAL_CHIP     =       1,
        FPGA                    =       2,
 };
 
-/* HAL_CUT_VERSION_E */
-enum HAL_CUT_VERSION_E { /* tag_HAL_Cut_Version_Definition */
+/* hal_cut_version_e */
+enum hal_cut_version_e { /* tag_HAL_Cut_Version_Definition */
        A_CUT_VERSION           =       0,
        B_CUT_VERSION           =       1,
        C_CUT_VERSION           =       2,
@@ -44,13 +44,13 @@ enum HAL_CUT_VERSION_E { /* tag_HAL_Cut_Version_Definition */
 };
 
 /*  HAL_Manufacturer */
-enum HAL_VENDOR_E { /* tag_HAL_Manufacturer_Version_Definition */
+enum hal_vendor_e { /* tag_HAL_Manufacturer_Version_Definition */
        CHIP_VENDOR_TSMC        =       0,
        CHIP_VENDOR_UMC         =       1,
        CHIP_VENDOR_SMIC        =       2,
 };
 
-enum HAL_RF_TYPE_E { /* tag_HAL_RF_Type_Definition */
+enum hal_rf_type_e { /* tag_HAL_RF_Type_Definition */
        RF_TYPE_1T1R    =       0,
        RF_TYPE_1T2R    =       1,
        RF_TYPE_2T2R    =       2,
@@ -61,36 +61,36 @@ enum HAL_RF_TYPE_E { /* tag_HAL_RF_Type_Definition */
        RF_TYPE_4T4R    =       7,
 };
 
-struct HAL_VERSION { /* tag_HAL_VERSION */
-       enum HAL_IC_TYPE_E              ICType;
-       enum HAL_CHIP_TYPE_E            ChipType;
-       enum HAL_CUT_VERSION_E  CUTVersion;
-       enum HAL_VENDOR_E               VendorType;
-       enum HAL_RF_TYPE_E              RFType;
+struct hal_version { /* tag_HAL_VERSION */
+       enum hal_ic_type_e              ICType;
+       enum hal_chip_type_e            ChipType;
+       enum hal_cut_version_e  CUTVersion;
+       enum hal_vendor_e               VendorType;
+       enum hal_rf_type_e              RFType;
        u8                      ROMVer;
 };
 
 /* VERSION_8192C                       VersionID; */
-/* HAL_VERSION                 VersionID; */
+/* hal_version                 VersionID; */
 
 /*  Get element */
-#define GET_CVID_IC_TYPE(version)                      ((enum HAL_IC_TYPE_E)((version).ICType))
-#define GET_CVID_CHIP_TYPE(version)                    ((enum HAL_CHIP_TYPE_E)((version).ChipType))
-#define GET_CVID_RF_TYPE(version)                      ((enum HAL_RF_TYPE_E)((version).RFType))
-#define GET_CVID_MANUFACTUER(version)          ((enum HAL_VENDOR_E)((version).VendorType))
-#define GET_CVID_CUT_VERSION(version)          ((enum HAL_CUT_VERSION_E)((version).CUTVersion))
+#define GET_CVID_IC_TYPE(version)                      ((enum hal_ic_type_e)((version).ICType))
+#define GET_CVID_CHIP_TYPE(version)                    ((enum hal_chip_type_e)((version).ChipType))
+#define GET_CVID_RF_TYPE(version)                      ((enum hal_rf_type_e)((version).RFType))
+#define GET_CVID_MANUFACTUER(version)          ((enum hal_vendor_e)((version).VendorType))
+#define GET_CVID_CUT_VERSION(version)          ((enum hal_cut_version_e)((version).CUTVersion))
 #define GET_CVID_ROM_VERSION(version)          (((version).ROMVer) & ROM_VERSION_MASK)
 
 /*  */
 /* Common Macro. -- */
 /*  */
-/* HAL_VERSION VersionID */
+/* hal_version VersionID */
 
-/* HAL_CHIP_TYPE_E */
+/* hal_chip_type_e */
 #define IS_TEST_CHIP(version)                  ((GET_CVID_CHIP_TYPE(version) == TEST_CHIP) ? true : false)
 #define IS_NORMAL_CHIP(version)                        ((GET_CVID_CHIP_TYPE(version) == NORMAL_CHIP) ? true : false)
 
-/* HAL_CUT_VERSION_E */
+/* hal_cut_version_e */
 #define IS_A_CUT(version)                              ((GET_CVID_CUT_VERSION(version) == A_CUT_VERSION) ? true : false)
 #define IS_B_CUT(version)                              ((GET_CVID_CUT_VERSION(version) == B_CUT_VERSION) ? true : false)
 #define IS_C_CUT(version)                              ((GET_CVID_CUT_VERSION(version) == C_CUT_VERSION) ? true : false)
@@ -100,12 +100,12 @@ struct HAL_VERSION { /* tag_HAL_VERSION */
 #define IS_J_CUT(version)                              ((GET_CVID_CUT_VERSION(version) == J_CUT_VERSION) ? true : false)
 #define IS_K_CUT(version)                              ((GET_CVID_CUT_VERSION(version) == K_CUT_VERSION) ? true : false)
 
-/* HAL_VENDOR_E */
+/* hal_vendor_e */
 #define IS_CHIP_VENDOR_TSMC(version)   ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_TSMC) ? true : false)
 #define IS_CHIP_VENDOR_UMC(version)    ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? true : false)
 #define IS_CHIP_VENDOR_SMIC(version)   ((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_SMIC) ? true : false)
 
-/* HAL_RF_TYPE_E */
+/* hal_rf_type_e */
 #define IS_1T1R(version)                                       ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T1R) ? true : false)
 #define IS_1T2R(version)                                       ((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false)
 #define IS_2T2R(version)                                       ((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false)

diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index 18a72feb8b6901c6bf79ffdb2d03a602d77f7e7b..28451385dec3a8a45781010a229d1faba3150d1d 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -193,7 +193,7 @@ enum firmware_source {
 u8 rtw_hal_data_init(struct adapter *padapter);
 void rtw_hal_data_deinit(struct adapter *padapter);
 
-void dump_chip_info(struct HAL_VERSION ChipVersion);
+void dump_chip_info(struct hal_version ChipVersion);
 
 u8 /* return the final channel plan decision */
 hal_com_config_channel_plan(

diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h
index 8e75a334c60b3e25fa550a4ab81c87744f438670..5f7cad83ce1ccc5fa91a29564dc4b9589fb259e5 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_data.h
+++ b/drivers/staging/rtl8723bs/include/hal_data.h
@@ -176,7 +176,7 @@ struct dm_priv {
 
 
 struct hal_com_data {
-       struct HAL_VERSION VersionID;
+       struct hal_version VersionID;
        enum RT_MULTI_FUNC MultiFunc; /*  For multi-function consideration. */
        enum RT_POLARITY_CTL PolarityCtl; /*  For Wifi PDn Polarity control. */
        enum RT_REGULATOR_MODE  RegulatorMode; /*  switching regulator or LDO */