Skip to content

Commit

Permalink
staging: rtl8723bs: remove typedefs in odm.h
Browse files Browse the repository at this point in the history
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
    #1229: FILE: hal/odm.h:1229:
    + typedef enum _ODM_RF_CONTENT {

    WARNING: do not add new typedefs
    #1236: FILE: hal/odm.h:1236:
    +typedef enum _ODM_BB_Config_Type {

    WARNING: do not add new typedefs
    #1246: FILE: hal/odm.h:1246:
    +typedef enum _ODM_RF_Config_Type {

    WARNING: do not add new typedefs
    #1251: FILE: hal/odm.h:1251:
    +typedef enum _ODM_FW_Config_Type {

    WARNING: do not add new typedefs
    #1262: FILE: hal/odm.h:1262:
    +typedef enum _RT_STATUS {

    WARNING: do not add new typedefs
    #1319: FILE: hal/odm.h:1319:
    +typedef enum tag_1R_CCA_Type_Definition {

    WARNING: do not add new typedefs
    #1325: FILE: hal/odm.h:1325:
    +typedef enum tag_RF_Type_Definition {

    WARNING: do not add new typedefs
    #1334: FILE: hal/odm.h:1334:
    +typedef enum tag_SW_Antenna_Switch_Definition {

Signed-off-by: Marco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-4-marco.cesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Marco Cesati authored and gregkh committed Mar 12, 2021
1 parent 743c5f8 commit 694a76b
Show file tree
Hide file tree
Showing 31 changed files with 326 additions and 326 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/rtl8723bs/core/rtw_odm.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ inline void rtw_odm_ability_set(struct adapter *adapter, u32 ability)
void rtw_odm_adaptivity_parm_msg(void *sel, struct adapter *adapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv;
struct DM_ODM_T *odm = &pHalData->odmpriv;

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

odm->TH_L2H_ini = TH_L2H_ini;
odm->TH_EDCCA_HL_diff = TH_EDCCA_HL_diff;
Expand All @@ -186,7 +186,7 @@ void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini,
void rtw_odm_get_perpkt_rssi(void *sel, struct adapter *adapter)
{
struct hal_com_data *hal_data = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &hal_data->odmpriv;
struct DM_ODM_T *odm = &hal_data->odmpriv;

DBG_871X_SEL_NL(sel, "RxRate = %s, RSSI_A = %d(%%), RSSI_B = %d(%%)\n",
HDATA_RATE(odm->RxRate), odm->RSSI_A, odm->RSSI_B);
Expand Down
10 changes: 5 additions & 5 deletions drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "odm_precomp.h"

static bool CheckPositive(
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
)
{
u8 _BoardType =
Expand Down Expand Up @@ -112,7 +112,7 @@ static bool CheckPositive(
}

static bool CheckNegative(
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
)
{
return true;
Expand Down Expand Up @@ -257,7 +257,7 @@ static u32 Array_MP_8723B_AGC_TAB[] = {

};

void ODM_ReadAndConfig_MP_8723B_AGC_TAB(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct DM_ODM_T * pDM_Odm)
{
u32 i = 0;
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_AGC_TAB);
Expand Down Expand Up @@ -526,7 +526,7 @@ static u32 Array_MP_8723B_PHY_REG[] = {

};

void ODM_ReadAndConfig_MP_8723B_PHY_REG(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct DM_ODM_T * pDM_Odm)
{
u32 i = 0;
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_PHY_REG);
Expand Down Expand Up @@ -606,7 +606,7 @@ static u32 Array_MP_8723B_PHY_REG_PG[] = {
0, 0, 0, 0x00000e14, 0xffffffff, 0x26303436
};

void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct DM_ODM_T * pDM_Odm)
{
u32 i = 0;
u32 *Array = Array_MP_8723B_PHY_REG_PG;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

void
ODM_ReadAndConfig_MP_8723B_AGC_TAB(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);

/******************************************************************************
Expand All @@ -24,7 +24,7 @@ ODM_ReadAndConfig_MP_8723B_AGC_TAB(/* TC: Test Chip, MP: MP Chip */

void
ODM_ReadAndConfig_MP_8723B_PHY_REG(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);

/******************************************************************************
Expand All @@ -33,7 +33,7 @@ ODM_ReadAndConfig_MP_8723B_PHY_REG(/* TC: Test Chip, MP: MP Chip */

void
ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);
u32 ODM_GetVersion_MP_8723B_PHY_REG_PG(void);

Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "odm_precomp.h"

static bool CheckPositive(
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
)
{
u8 _BoardType =
Expand Down Expand Up @@ -111,7 +111,7 @@ static bool CheckPositive(
}

static bool CheckNegative(
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
)
{
return true;
Expand Down Expand Up @@ -228,7 +228,7 @@ static u32 Array_MP_8723B_MAC_REG[] = {

};

void ODM_ReadAndConfig_MP_8723B_MAC_REG(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct DM_ODM_T * pDM_Odm)
{
u32 i = 0;
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_MAC_REG);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

void
ODM_ReadAndConfig_MP_8723B_MAC_REG(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);
#endif
12 changes: 6 additions & 6 deletions drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "odm_precomp.h"

static bool CheckPositive(
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
)
{
u8 _BoardType =
Expand Down Expand Up @@ -121,7 +121,7 @@ static bool CheckPositive(
}

static bool CheckNegative(
PDM_ODM_T pDM_Odm, const u32 Condition1, const u32 Condition2
struct DM_ODM_T * pDM_Odm, const u32 Condition1, const u32 Condition2
)
{
return true;
Expand Down Expand Up @@ -259,7 +259,7 @@ static u32 Array_MP_8723B_RadioA[] = {

};

void ODM_ReadAndConfig_MP_8723B_RadioA(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_RadioA(struct DM_ODM_T * pDM_Odm)
{
u32 i = 0;
u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_RadioA);
Expand Down Expand Up @@ -420,9 +420,9 @@ static u8 gDeltaSwingTableIdx_MP_2GCCKA_P_TxPowerTrack_SDIO_8723B[] = {
8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 15
};

void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct DM_ODM_T * pDM_Odm)
{
PODM_RF_CAL_T pRFCalibrateInfo = &(pDM_Odm->RFCalibrateInfo);
struct ODM_RF_CAL_T * pRFCalibrateInfo = &(pDM_Odm->RFCalibrateInfo);

ODM_RT_TRACE(
pDM_Odm,
Expand Down Expand Up @@ -755,7 +755,7 @@ static u8 *Array_MP_8723B_TXPWR_LMT[] = {
"MKK", "2.4G", "40M", "HT", "2T", "14", "63"
};

void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(PDM_ODM_T pDM_Odm)
void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct DM_ODM_T * pDM_Odm)
{
u32 i = 0;
u8 **Array = Array_MP_8723B_TXPWR_LMT;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

void
ODM_ReadAndConfig_MP_8723B_RadioA(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);

/******************************************************************************
Expand All @@ -24,7 +24,7 @@ ODM_ReadAndConfig_MP_8723B_RadioA(/* TC: Test Chip, MP: MP Chip */

void
ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);
u32 ODM_GetVersion_MP_8723B_TxPowerTrack_SDIO(void);

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

void
ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(/* TC: Test Chip, MP: MP Chip */
PDM_ODM_T pDM_Odm
struct DM_ODM_T * pDM_Odm
);
u32 ODM_GetVersion_MP_8723B_TXPWR_LMT(void);

Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8723bs/hal/HalPhyRf.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
} while (0)


void ConfigureTxpowerTrack(PDM_ODM_T pDM_Odm, struct TXPWRTRACK_CFG * pConfig)
void ConfigureTxpowerTrack(struct DM_ODM_T * pDM_Odm, struct TXPWRTRACK_CFG * pConfig)
{
ConfigureTxpowerTrack_8723B(pConfig);
}
Expand All @@ -36,7 +36,7 @@ void ConfigureTxpowerTrack(PDM_ODM_T pDM_Odm, struct TXPWRTRACK_CFG * pConfig)
/* NOTE: If Tx BB swing or Tx scaling is varified during run-time, still */
/* need to call this function. */
/* */
void ODM_ClearTxPowerTrackingState(PDM_ODM_T pDM_Odm)
void ODM_ClearTxPowerTrackingState(struct DM_ODM_T * pDM_Odm)
{
struct hal_com_data *pHalData = GET_HAL_DATA(pDM_Odm->Adapter);
u8 p = 0;
Expand Down Expand Up @@ -74,7 +74,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
{

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

u8 ThermalValue = 0, delta, delta_LCK, delta_IQK, p = 0, i = 0;
u8 ThermalValue_AVG_count = 0;
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/rtl8723bs/hal/HalPhyRf.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ enum PWRTRACK_METHOD {
MIX_MODE
};

typedef void (*FuncSetPwr)(PDM_ODM_T, enum PWRTRACK_METHOD, u8, u8);
typedef void (*FuncIQK)(PDM_ODM_T, u8, u8, u8);
typedef void (*FuncLCK)(PDM_ODM_T);
typedef void (*FuncSwing)(PDM_ODM_T, u8 **, u8 **, u8 **, u8 **);
typedef void (*FuncSetPwr)(struct DM_ODM_T *, enum PWRTRACK_METHOD, u8, u8);
typedef void (*FuncIQK)(struct DM_ODM_T *, u8, u8, u8);
typedef void (*FuncLCK)(struct DM_ODM_T *);
typedef void (*FuncSwing)(struct DM_ODM_T *, u8 **, u8 **, u8 **, u8 **);

struct TXPWRTRACK_CFG {
u8 SwingTableSize_CCK;
Expand All @@ -37,10 +37,10 @@ struct TXPWRTRACK_CFG {
FuncSwing GetDeltaSwingTable;
};

void ConfigureTxpowerTrack(PDM_ODM_T pDM_Odm, struct TXPWRTRACK_CFG * pConfig);
void ConfigureTxpowerTrack(struct DM_ODM_T * pDM_Odm, struct TXPWRTRACK_CFG * pConfig);


void ODM_ClearTxPowerTrackingState(PDM_ODM_T pDM_Odm);
void ODM_ClearTxPowerTrackingState(struct DM_ODM_T * pDM_Odm);

void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter);

Expand Down
Loading

0 comments on commit 694a76b

Please sign in to comment.