From 2f9c03f5216f7cb752103a7cd84ea431c199db48 Mon Sep 17 00:00:00 2001 From: Tony Cho Date: Mon, 21 Sep 2015 12:16:58 +0900 Subject: [PATCH] staging: wilc1000: remove typedef from the struct tstrHostIfRemainOnChan This patch removes typedef from the struct tstrHostIfRemainOnChan and renames it to remain_ch in order to comply with the Linux coding style Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 8 +++++--- drivers/staging/wilc1000/host_interface.h | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index ae56fb49c80a..df0077e02a9c 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -436,7 +436,7 @@ union message_body { struct set_mac_addr strHostIfSetMacAddress; struct get_mac_addr strHostIfGetMacAddress; struct ba_session_info strHostIfBASessionInfo; - tstrHostIfRemainOnChan strHostIfRemainOnChan; + struct remain_ch strHostIfRemainOnChan; tstrHostIfRegisterFrame strHostIfRegisterFrame; char *pUserData; tstrHostIFDelAllSta strHostIFDelAllSta; @@ -3773,7 +3773,8 @@ ERRORHANDLER: * @date * @version 1.0 */ -static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler, tstrHostIfRemainOnChan *pstrHostIfRemainOnChan) +static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler, + struct remain_ch *pstrHostIfRemainOnChan) { s32 s32Error = 0; u8 u8remain_on_chan_flag; @@ -3909,7 +3910,8 @@ static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler, tstrHostIfRegisterF * @version 1.0 */ #define FALSE_FRMWR_CHANNEL 100 -static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler, tstrHostIfRemainOnChan *pstrHostIfRemainOnChan) +static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler, + struct remain_ch *pstrHostIfRemainOnChan) { u8 u8remain_on_chan_flag; tstrWID strWID; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index aba00f115f44..e0fc27ffe5ce 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -278,14 +278,14 @@ struct ba_session_info { u16 u16SessionTimeout; }; -typedef struct { +struct remain_ch { u16 u16Channel; u32 u32duration; tWILCpfRemainOnChanExpired pRemainOnChanExpired; tWILCpfRemainOnChanReady pRemainOnChanReady; void *pVoid; u32 u32ListenSessionID; -} tstrHostIfRemainOnChan; +}; typedef struct { @@ -318,7 +318,7 @@ typedef struct { tstrWILC_UsrConnReq strWILC_UsrConnReq; /*Remain on channel struvture*/ - tstrHostIfRemainOnChan strHostIfRemainOnChan; + struct remain_ch strHostIfRemainOnChan; u8 u8RemainOnChan_pendingreq; u64 u64P2p_MgmtTimeout; u8 u8P2PConnect; -- 2.34.1