staging: rtl8723bs: remove typedefs in HalVerDef.h

This commit fixes the following checkpatch.pl warnings:

    WARNING: do not add new typedefs
    #11: FILE: include/HalVerDef.h:11:
    +typedef enum tag_HAL_IC_Type_Definition {

    WARNING: do not add new typedefs
    #25: FILE: include/HalVerDef.h:25:
    +typedef enum tag_HAL_CHIP_Type_Definition {

    WARNING: do not add new typedefs
    #32: FILE: include/HalVerDef.h:32:
    +typedef enum tag_HAL_Cut_Version_Definition {

    WARNING: do not add new typedefs
    #47: FILE: include/HalVerDef.h:47:
    +typedef enum tag_HAL_Manufacturer_Version_Definition {

    WARNING: do not add new typedefs
    #53: FILE: include/HalVerDef.h:53:
    +typedef enum tag_HAL_RF_Type_Definition {

    WARNING: do not add new typedefs
    #64: FILE: include/HalVerDef.h:64:
    +typedef	struct tag_HAL_VERSION {

Signed-off-by: Marco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-22-marco.cesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marco Cesati
2021-03-12 09:26:26 +01:00
committed by Greg Kroah-Hartman
parent 07d4ad3e46
commit f30c26236c
5 changed files with 27 additions and 27 deletions

View File

@@ -38,7 +38,7 @@ void rtw_hal_data_deinit(struct adapter *padapter)
}
void dump_chip_info(HAL_VERSION ChipVersion)
void dump_chip_info(struct HAL_VERSION ChipVersion)
{
char buf[128];
size_t cnt = 0;

View File

@@ -1880,10 +1880,10 @@ static bool Hal_EfusePgPacketWrite_BT(
return true;
}
static HAL_VERSION ReadChipVersion8723B(struct adapter *padapter)
static struct HAL_VERSION ReadChipVersion8723B(struct adapter *padapter)
{
u32 value32;
HAL_VERSION ChipVersion;
struct HAL_VERSION ChipVersion;
struct hal_com_data *pHalData;
/* YJ, TODO, move read chip type here */

View File

@@ -8,7 +8,7 @@
#define __HAL_VERSION_DEF_H__
/* HAL_IC_TYPE_E */
typedef enum tag_HAL_IC_Type_Definition {
enum HAL_IC_TYPE_E { /* tag_HAL_IC_Type_Definition */
CHIP_8192S = 0,
CHIP_8188C = 1,
CHIP_8192C = 2,
@@ -19,17 +19,17 @@ typedef enum tag_HAL_IC_Type_Definition {
CHIP_8821 = 7,
CHIP_8723B = 8,
CHIP_8192E = 9,
} HAL_IC_TYPE_E;
};
/* HAL_CHIP_TYPE_E */
typedef enum tag_HAL_CHIP_Type_Definition {
enum HAL_CHIP_TYPE_E { /* tag_HAL_CHIP_Type_Definition */
TEST_CHIP = 0,
NORMAL_CHIP = 1,
FPGA = 2,
} HAL_CHIP_TYPE_E;
};
/* HAL_CUT_VERSION_E */
typedef enum tag_HAL_Cut_Version_Definition {
enum HAL_CUT_VERSION_E { /* tag_HAL_Cut_Version_Definition */
A_CUT_VERSION = 0,
B_CUT_VERSION = 1,
C_CUT_VERSION = 2,
@@ -41,16 +41,16 @@ typedef enum tag_HAL_Cut_Version_Definition {
I_CUT_VERSION = 8,
J_CUT_VERSION = 9,
K_CUT_VERSION = 10,
} HAL_CUT_VERSION_E;
};
/* HAL_Manufacturer */
typedef enum 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,
} HAL_VENDOR_E;
};
typedef enum 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,
@@ -59,26 +59,26 @@ typedef enum tag_HAL_RF_Type_Definition {
RF_TYPE_3T3R = 5,
RF_TYPE_3T4R = 6,
RF_TYPE_4T4R = 7,
} HAL_RF_TYPE_E;
};
typedef struct tag_HAL_VERSION {
HAL_IC_TYPE_E ICType;
HAL_CHIP_TYPE_E ChipType;
HAL_CUT_VERSION_E CUTVersion;
HAL_VENDOR_E VendorType;
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;
} HAL_VERSION, *PHAL_VERSION;
};
/* VERSION_8192C VersionID; */
/* HAL_VERSION VersionID; */
/* Get element */
#define GET_CVID_IC_TYPE(version) ((HAL_IC_TYPE_E)((version).ICType))
#define GET_CVID_CHIP_TYPE(version) ((HAL_CHIP_TYPE_E)((version).ChipType))
#define GET_CVID_RF_TYPE(version) ((HAL_RF_TYPE_E)((version).RFType))
#define GET_CVID_MANUFACTUER(version) ((HAL_VENDOR_E)((version).VendorType))
#define GET_CVID_CUT_VERSION(version) ((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)
/* */

View File

@@ -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(HAL_VERSION ChipVersion);
void dump_chip_info(struct HAL_VERSION ChipVersion);
u8 /* return the final channel plan decision */
hal_com_config_channel_plan(

View File

@@ -176,7 +176,7 @@ struct dm_priv {
struct hal_com_data {
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 */