From 3322d579679dbb030de72ac66434b476663252e5 Mon Sep 17 00:00:00 2001 From: Bhanusree Pola Date: Fri, 19 Apr 2019 17:22:14 +0530 Subject: [PATCH] Staging: rtl8723bs: Avoid typedefs for structure Avoid typedefs for structure types to maintain kernel coding style. Remove typedefs for _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_. This part is done by the following semantic patch: @r1@ identifier i; type t; @@ typedef struct i { ... }t; @r2@ type r1.t; identifier v; @@ t v; @script:python match@ i << r1.i; x; @@ coccinelle.x = i; @r4@ identifier match.x; type r1.t; @@ - typedef struct x + struct x { ... } - t ; @r5@ type r1.t; identifier r2.v, match.x; @@ - t v; + struct x v; Change Structure name _ODM_Phy_Dbg_Info and _ODM_Mac_Status_Info_ to maintain Linux kernel Coding Style. Replace occurences of ODM_PHY_DBG_INFO_T to odm_phy_dbg_info and ODM_MAC_INFO to odm_mac_status_info. Signed-off-by: Bhanusree Pola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/odm.c | 2 +- drivers/staging/rtl8723bs/hal/odm.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c index 381065e..e3f4307 100644 --- a/drivers/staging/rtl8723bs/hal/odm.c +++ b/drivers/staging/rtl8723bs/hal/odm.c @@ -691,7 +691,7 @@ void ODM_CmnInfoHook(PDM_ODM_T pDM_Odm, ODM_CMNINFO_E CmnInfo, void *pValue) /* break; */ /* case ODM_CMNINFO_MAC_STATUS: */ - /* pDM_Odm->pMacInfo = (ODM_MAC_INFO *)pValue; */ + /* pDM_Odm->pMacInfo = (struct odm_mac_status_info *)pValue; */ /* break; */ /* To remove the compiler warning, must add an empty default statement to handle the other values. */ default: diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index 4f1aeb8d..6ba77bb 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -261,7 +261,7 @@ struct odm_packet_info { bool is_beacon; }; -typedef struct _ODM_Phy_Dbg_Info_ { +struct odm_phy_dbg_info { /* ODM Write, debug info */ s8 RxSNRdB[4]; u32 NumQryPhyStatus; @@ -271,11 +271,11 @@ typedef struct _ODM_Phy_Dbg_Info_ { /* Others */ s32 RxEVM[4]; -} ODM_PHY_DBG_INFO_T; +}; -typedef struct _ODM_Mac_Status_Info_ { +struct odm_mac_status_info { u8 test; -} ODM_MAC_INFO; +}; typedef enum tag_Dynamic_ODM_Support_Ability_Type { /* BB Team */ @@ -1092,11 +1092,11 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure { /* Define ........... */ /* Latest packet phy info (ODM write) */ - ODM_PHY_DBG_INFO_T PhyDbgInfo; + struct odm_phy_dbg_info PhyDbgInfo; /* PHY_INFO_88E PhyInfo; */ /* Latest packet phy info (ODM write) */ - ODM_MAC_INFO *pMacInfo; + struct odm_mac_status_info *pMacInfo; /* MAC_INFO_88E MacInfo; */ /* Different Team independt structure?? */ -- 2.7.4