Skip to content

Commit 694a76b

Browse files
Marco Cesatigregkh
Marco Cesati
authored and
gregkh
committed
staging: rtl8723bs: remove typedefs in odm.h
This commit fixes the following checkpatch.pl warnings: WARNING: do not add new typedefs torvalds#95: FILE: hal/odm.h:95: +typedef struct _Rate_Adaptive_Table_ { WARNING: do not add new typedefs torvalds#99: FILE: hal/odm.h:99: +typedef struct _RX_High_Power_ { WARNING: do not add new typedefs torvalds#129: FILE: hal/odm.h:129: +typedef struct _SW_Antenna_Switch_ { WARNING: do not add new typedefs torvalds#181: FILE: hal/odm.h:181: +typedef struct _ODM_RATE_ADAPTIVE { WARNING: do not add new typedefs torvalds#280: FILE: hal/odm.h:280: +typedef enum tag_Dynamic_ODM_Support_Ability_Type { WARNING: do not add new typedefs torvalds#300: FILE: hal/odm.h:300: +typedef struct _ODM_STA_INFO { WARNING: do not add new typedefs torvalds#328: FILE: hal/odm.h:328: +typedef enum _ODM_Common_Info_Definition { WARNING: do not add new typedefs torvalds#418: FILE: hal/odm.h:418: +typedef enum _ODM_Support_Ability_Definition { WARNING: do not add new typedefs torvalds#449: FILE: hal/odm.h:449: +typedef enum tag_ODM_Support_Interface_Definition { WARNING: do not add new typedefs torvalds#455: FILE: hal/odm.h:455: +typedef enum tag_ODM_Support_IC_Type_Definition { WARNING: do not add new typedefs torvalds#460: FILE: hal/odm.h:460: +typedef enum tag_ODM_Cut_Version_Definition { WARNING: do not add new typedefs torvalds#475: FILE: hal/odm.h:475: +typedef enum tag_ODM_Fab_Version_Definition { WARNING: do not add new typedefs torvalds#484: FILE: hal/odm.h:484: +typedef enum tag_ODM_RF_Path_Bit_Definition { WARNING: do not add new typedefs torvalds#495: FILE: hal/odm.h:495: +typedef enum tag_ODM_RF_Type_Definition { WARNING: do not add new typedefs torvalds#516: FILE: hal/odm.h:516: +typedef enum tag_ODM_MAC_PHY_Mode_Definition { WARNING: do not add new typedefs torvalds#522: FILE: hal/odm.h:522: +typedef enum tag_BT_Coexist_Definition { WARNING: do not add new typedefs torvalds#530: FILE: hal/odm.h:530: +typedef enum tag_Operation_Mode_Definition { WARNING: do not add new typedefs torvalds#543: FILE: hal/odm.h:543: +typedef enum tag_Wireless_Mode_Definition { WARNING: do not add new typedefs torvalds#555: FILE: hal/odm.h:555: +typedef enum tag_Band_Type_Definition { WARNING: do not add new typedefs torvalds#563: FILE: hal/odm.h:563: +typedef enum tag_Secondary_Channel_Offset_Definition { WARNING: do not add new typedefs torvalds#570: FILE: hal/odm.h:570: +typedef enum tag_Security_Definition { WARNING: do not add new typedefs torvalds#582: FILE: hal/odm.h:582: +typedef enum tag_Bandwidth_Definition { WARNING: do not add new typedefs torvalds#593: FILE: hal/odm.h:593: +typedef enum tag_Board_Definition { WARNING: do not add new typedefs torvalds#605: FILE: hal/odm.h:605: +typedef enum tag_ODM_Package_Definition { WARNING: do not add new typedefs torvalds#612: FILE: hal/odm.h:612: +typedef enum tag_ODM_TYPE_GPA_Definition { WARNING: do not add new typedefs torvalds#617: FILE: hal/odm.h:617: +typedef enum tag_ODM_TYPE_APA_Definition { WARNING: do not add new typedefs torvalds#622: FILE: hal/odm.h:622: +typedef enum tag_ODM_TYPE_GLNA_Definition { WARNING: do not add new typedefs torvalds#629: FILE: hal/odm.h:629: +typedef enum tag_ODM_TYPE_ALNA_Definition { WARNING: do not add new typedefs torvalds#637: FILE: hal/odm.h:637: +typedef enum tag_CCA_Path { WARNING: do not add new typedefs torvalds#643: FILE: hal/odm.h:643: +typedef struct _ODM_RA_Info_ { WARNING: do not add new typedefs torvalds#675: FILE: hal/odm.h:675: +typedef struct _IQK_MATRIX_REGS_SETTING { WARNING: do not add new typedefs torvalds#683: FILE: hal/odm.h:683: +typedef struct ODM_RF_Calibration_Structure { WARNING: do not add new typedefs #788: FILE: hal/odm.h:788: +typedef struct _FAST_ANTENNA_TRAINNING_ { WARNING: do not add new typedefs torvalds#828: FILE: hal/odm.h:828: +typedef enum _FAT_STATE { WARNING: do not add new typedefs torvalds#833: FILE: hal/odm.h:833: +typedef enum _ANT_DIV_TYPE { WARNING: do not add new typedefs torvalds#843: FILE: hal/odm.h:843: +typedef struct _ODM_PATH_DIVERSITY_ { WARNING: do not add new typedefs torvalds#852: FILE: hal/odm.h:852: +typedef enum _BASEBAND_CONFIG_PHY_REG_PG_VALUE_TYPE { WARNING: do not add new typedefs torvalds#860: FILE: hal/odm.h:860: +typedef struct _ANT_DETECTED_INFO { WARNING: do not add new typedefs torvalds#870: FILE: hal/odm.h:870: +typedef struct DM_Out_Source_Dynamic_Mechanism_Structure { WARNING: do not add new typedefs torvalds#1229: FILE: hal/odm.h:1229: + typedef enum _ODM_RF_CONTENT { WARNING: do not add new typedefs torvalds#1236: FILE: hal/odm.h:1236: +typedef enum _ODM_BB_Config_Type { WARNING: do not add new typedefs torvalds#1246: FILE: hal/odm.h:1246: +typedef enum _ODM_RF_Config_Type { WARNING: do not add new typedefs torvalds#1251: FILE: hal/odm.h:1251: +typedef enum _ODM_FW_Config_Type { WARNING: do not add new typedefs torvalds#1262: FILE: hal/odm.h:1262: +typedef enum _RT_STATUS { WARNING: do not add new typedefs torvalds#1319: FILE: hal/odm.h:1319: +typedef enum tag_1R_CCA_Type_Definition { WARNING: do not add new typedefs torvalds#1325: FILE: hal/odm.h:1325: +typedef enum tag_RF_Type_Definition { WARNING: do not add new typedefs torvalds#1334: FILE: hal/odm.h:1334: +typedef enum tag_SW_Antenna_Switch_Definition { Signed-off-by: Marco Cesati <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 743c5f8 commit 694a76b

31 files changed

+326
-326
lines changed

‎drivers/staging/rtl8723bs/core/rtw_odm.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ inline void rtw_odm_ability_set(struct adapter *adapter, u32 ability)
152152
void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter)
153153
{
154154
struct hal_com_data *pHalData = GET_HAL_DATA(adapter);
155-
DM_ODM_T *odm = &pHalData->odmpriv;
155+
struct DM_ODM_T *odm = &pHalData->odmpriv;
156156

157157
DBG_871X_SEL_NL(sel, "%10s %16s %8s %10s %11s %14s\n",
158158
"TH_L2H_ini", "TH_EDCCA_HL_diff", "IGI_Base",
@@ -173,7 +173,7 @@ void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini,
173173
u8 IGI_LowerBound)
174174
{
175175
struct hal_com_data *pHalData = GET_HAL_DATA(adapter);
176-
DM_ODM_T *odm = &pHalData->odmpriv;
176+
struct DM_ODM_T *odm = &pHalData->odmpriv;
177177

178178
odm->TH_L2H_ini = TH_L2H_ini;
179179
odm->TH_EDCCA_HL_diff = TH_EDCCA_HL_diff;
@@ -186,7 +186,7 @@ void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini,
186186
void rtw_odm_get_perpkt_rssi(void *sel, struct adapter *adapter)
187187
{
188188
struct hal_com_data *hal_data = GET_HAL_DATA(adapter);
189-
DM_ODM_T *odm = &hal_data->odmpriv;
189+
struct DM_ODM_T *odm = &hal_data->odmpriv;
190190

191191
DBG_871X_SEL_NL(sel, "RxRate = %s, RSSI_A = %d(%%), RSSI_B = %d(%%)\n",
192192
HDATA_RATE(odm->RxRate), odm->RSSI_A, odm->RSSI_B);

‎drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "odm_precomp.h"
1010

1111
static bool CheckPositive(
12-
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
12+
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
1313
)
1414
{
1515
u8 _BoardType =
@@ -112,7 +112,7 @@ static bool CheckPositive(
112112
}
113113

114114
static bool CheckNegative(
115-
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
115+
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
116116
)
117117
{
118118
return true;
@@ -257,7 +257,7 @@ static u32 Array_MP_8723B_AGC_TAB[] = {
257257

258258
};
259259

260-
void ODM_ReadAndConfig_MP_8723B_AGC_TAB(PDM_ODM_T pDM_Odm)
260+
void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct DM_ODM_T * pDM_Odm)
261261
{
262262
u32 i = 0;
263263
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_AGC_TAB);
@@ -526,7 +526,7 @@ static u32 Array_MP_8723B_PHY_REG[] = {
526526

527527
};
528528

529-
void ODM_ReadAndConfig_MP_8723B_PHY_REG(PDM_ODM_T pDM_Odm)
529+
void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct DM_ODM_T * pDM_Odm)
530530
{
531531
u32 i = 0;
532532
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_PHY_REG);
@@ -606,7 +606,7 @@ static u32 Array_MP_8723B_PHY_REG_PG[] = {
606606
0, 0, 0, 0x00000e14, 0xffffffff, 0x26303436
607607
};
608608

609-
void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(PDM_ODM_T pDM_Odm)
609+
void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct DM_ODM_T * pDM_Odm)
610610
{
611611
u32 i = 0;
612612
u32 *Array = Array_MP_8723B_PHY_REG_PG;

‎drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
void
1717
ODM_ReadAndConfig_MP_8723B_AGC_TAB(/* TC: Test Chip, MP: MP Chip */
18-
PDM_ODM_T pDM_Odm
18+
struct DM_ODM_T * pDM_Odm
1919
);
2020

2121
/******************************************************************************
@@ -24,7 +24,7 @@ ODM_ReadAndConfig_MP_8723B_AGC_TAB(/* TC: Test Chip, MP: MP Chip */
2424

2525
void
2626
ODM_ReadAndConfig_MP_8723B_PHY_REG(/* TC: Test Chip, MP: MP Chip */
27-
PDM_ODM_T pDM_Odm
27+
struct DM_ODM_T * pDM_Odm
2828
);
2929

3030
/******************************************************************************
@@ -33,7 +33,7 @@ ODM_ReadAndConfig_MP_8723B_PHY_REG(/* TC: Test Chip, MP: MP Chip */
3333

3434
void
3535
ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(/* TC: Test Chip, MP: MP Chip */
36-
PDM_ODM_T pDM_Odm
36+
struct DM_ODM_T * pDM_Odm
3737
);
3838
u32 ODM_GetVersion_MP_8723B_PHY_REG_PG(void);
3939

‎drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "odm_precomp.h"
1010

1111
static bool CheckPositive(
12-
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
12+
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
1313
)
1414
{
1515
u8 _BoardType =
@@ -111,7 +111,7 @@ static bool CheckPositive(
111111
}
112112

113113
static bool CheckNegative(
114-
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
114+
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
115115
)
116116
{
117117
return true;
@@ -228,7 +228,7 @@ static u32 Array_MP_8723B_MAC_REG[] = {
228228

229229
};
230230

231-
void ODM_ReadAndConfig_MP_8723B_MAC_REG(PDM_ODM_T pDM_Odm)
231+
void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct DM_ODM_T * pDM_Odm)
232232
{
233233
u32 i = 0;
234234
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_MAC_REG);

‎drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
void
1717
ODM_ReadAndConfig_MP_8723B_MAC_REG(/* TC: Test Chip, MP: MP Chip */
18-
PDM_ODM_T pDM_Odm
18+
struct DM_ODM_T * pDM_Odm
1919
);
2020
#endif

‎drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "odm_precomp.h"
1010

1111
static bool CheckPositive(
12-
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
12+
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
1313
)
1414
{
1515
u8 _BoardType =
@@ -121,7 +121,7 @@ static bool CheckPositive(
121121
}
122122

123123
static bool CheckNegative(
124-
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
124+
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
125125
)
126126
{
127127
return true;
@@ -259,7 +259,7 @@ static u32 Array_MP_8723B_RadioA[] = {
259259

260260
};
261261

262-
void ODM_ReadAndConfig_MP_8723B_RadioA(PDM_ODM_T pDM_Odm)
262+
void ODM_ReadAndConfig_MP_8723B_RadioA(struct DM_ODM_T * pDM_Odm)
263263
{
264264
u32 i = 0;
265265
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_RadioA);
@@ -420,9 +420,9 @@ static u8 gDeltaSwingTableIdx_MP_2GCCKA_P_TxPowerTrack_SDIO_8723B[] = {
420420
8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 15
421421
};
422422

423-
void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(PDM_ODM_T pDM_Odm)
423+
void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct DM_ODM_T * pDM_Odm)
424424
{
425-
PODM_RF_CAL_T pRFCalibrateInfo = &(pDM_Odm->RFCalibrateInfo);
425+
struct ODM_RF_CAL_T * pRFCalibrateInfo = &(pDM_Odm->RFCalibrateInfo);
426426

427427
ODM_RT_TRACE(
428428
pDM_Odm,
@@ -755,7 +755,7 @@ static u8 *Array_MP_8723B_TXPWR_LMT[] = {
755755
"MKK", "2.4G", "40M", "HT", "2T", "14", "63"
756756
};
757757

758-
void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(PDM_ODM_T pDM_Odm)
758+
void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct DM_ODM_T * pDM_Odm)
759759
{
760760
u32 i = 0;
761761
u8 **Array = Array_MP_8723B_TXPWR_LMT;

‎drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
void
1717
ODM_ReadAndConfig_MP_8723B_RadioA(/* TC: Test Chip, MP: MP Chip */
18-
PDM_ODM_T pDM_Odm
18+
struct DM_ODM_T * pDM_Odm
1919
);
2020

2121
/******************************************************************************
@@ -24,7 +24,7 @@ ODM_ReadAndConfig_MP_8723B_RadioA(/* TC: Test Chip, MP: MP Chip */
2424

2525
void
2626
ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(/* TC: Test Chip, MP: MP Chip */
27-
PDM_ODM_T pDM_Odm
27+
struct DM_ODM_T * pDM_Odm
2828
);
2929
u32 ODM_GetVersion_MP_8723B_TxPowerTrack_SDIO(void);
3030

@@ -34,7 +34,7 @@ u32 ODM_GetVersion_MP_8723B_TxPowerTrack_SDIO(void);
3434

3535
void
3636
ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(/* TC: Test Chip, MP: MP Chip */
37-
PDM_ODM_T pDM_Odm
37+
struct DM_ODM_T * pDM_Odm
3838
);
3939
u32 ODM_GetVersion_MP_8723B_TXPWR_LMT(void);
4040

‎drivers/staging/rtl8723bs/hal/HalPhyRf.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
} while (0)
2424

2525

26-
void ConfigureTxpowerTrack(PDM_ODM_T pDM_Odm, struct TXPWRTRACK_CFG * pConfig)
26+
void ConfigureTxpowerTrack(struct DM_ODM_T * pDM_Odm, struct TXPWRTRACK_CFG * pConfig)
2727
{
2828
ConfigureTxpowerTrack_8723B(pConfig);
2929
}
@@ -36,7 +36,7 @@ void ConfigureTxpowerTrack(PDM_ODM_T pDM_Odm, struct TXPWRTRACK_CFG * pConfig)
3636
/* NOTE: If Tx BB swing or Tx scaling is varified during run-time, still */
3737
/* need to call this function. */
3838
/* */
39-
void ODM_ClearTxPowerTrackingState(PDM_ODM_T pDM_Odm)
39+
void ODM_ClearTxPowerTrackingState(struct DM_ODM_T * pDM_Odm)
4040
{
4141
struct hal_com_data *pHalData = GET_HAL_DATA(pDM_Odm->Adapter);
4242
u8 p = 0;
@@ -74,7 +74,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
7474
{
7575

7676
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
77-
PDM_ODM_T pDM_Odm = &pHalData->odmpriv;
77+
struct DM_ODM_T * pDM_Odm = &pHalData->odmpriv;
7878

7979
u8 ThermalValue = 0, delta, delta_LCK, delta_IQK, p = 0, i = 0;
8080
u8 ThermalValue_AVG_count = 0;

‎drivers/staging/rtl8723bs/hal/HalPhyRf.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ enum PWRTRACK_METHOD {
1919
MIX_MODE
2020
};
2121

22-
typedef void (*FuncSetPwr)(PDM_ODM_T, enum PWRTRACK_METHOD, u8, u8);
23-
typedef void (*FuncIQK)(PDM_ODM_T, u8, u8, u8);
24-
typedef void (*FuncLCK)(PDM_ODM_T);
25-
typedef void (*FuncSwing)(PDM_ODM_T, u8 **, u8 **, u8 **, u8 **);
22+
typedef void (*FuncSetPwr)(struct DM_ODM_T *, enum PWRTRACK_METHOD, u8, u8);
23+
typedef void (*FuncIQK)(struct DM_ODM_T *, u8, u8, u8);
24+
typedef void (*FuncLCK)(struct DM_ODM_T *);
25+
typedef void (*FuncSwing)(struct DM_ODM_T *, u8 **, u8 **, u8 **, u8 **);
2626

2727
struct TXPWRTRACK_CFG {
2828
u8 SwingTableSize_CCK;
@@ -37,10 +37,10 @@ struct TXPWRTRACK_CFG {
3737
FuncSwing GetDeltaSwingTable;
3838
};
3939

40-
void ConfigureTxpowerTrack(PDM_ODM_T pDM_Odm, struct TXPWRTRACK_CFG * pConfig);
40+
void ConfigureTxpowerTrack(struct DM_ODM_T * pDM_Odm, struct TXPWRTRACK_CFG * pConfig);
4141

4242

43-
void ODM_ClearTxPowerTrackingState(PDM_ODM_T pDM_Odm);
43+
void ODM_ClearTxPowerTrackingState(struct DM_ODM_T * pDM_Odm);
4444

4545
void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter);
4646

0 commit comments

Comments
 (0)