From 6a89ba9cee532e93098b014ea90d8efdebfc28c6 Mon Sep 17 00:00:00 2001 From: Tony Cho Date: Mon, 21 Sep 2015 12:16:46 +0900 Subject: [PATCH] staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam This patch removes typedef from the struct tstrWILC_AddStaParam and renames it to add_sta_param in oder to comply with the Linux coding style. Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 37 +++++++++++-------- drivers/staging/wilc1000/host_interface.h | 16 +++++--- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index b2f04a50a662..93c4d7a2f97c 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -425,9 +425,9 @@ union message_body { struct get_channel strHostIFGetChan; struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */ struct del_beacon strHostIFDelBeacon; /*!< Del beacon message body */ - tstrWILC_AddStaParam strAddStaParam; /*!< Add station message body */ + struct add_sta_param strAddStaParam; /*!< Add station message body */ tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */ - tstrWILC_AddStaParam strEditStaParam; /*!< Edit station message body */ + struct add_sta_param strEditStaParam; /*!< Edit station message body */ /* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */ tstrTimerCb strTimerCb; /*!< Timer callback message body */ tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management message body */ @@ -3533,13 +3533,14 @@ static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler, /** * @brief WILC_HostIf_PackStaParam * @details Handling packing of the station params in a buffer - * @param[in] u8* pu8Buffer, tstrWILC_AddStaParam* pstrStationParam + * @param[in] u8* pu8Buffer, struct add_sta_param *pstrStationParam * @return NONE * @author * @date * @version 1.0 */ -static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrStationParam) +static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, + struct add_sta_param *pstrStationParam) { u8 *pu8CurrByte; @@ -3587,13 +3588,14 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrSta /** * @brief Handle_AddStation * @details Sending config packet to add station - * @param[in] tstrWILC_AddStaParam* pstrStationParam + * @param[in] struct add_sta_param *pstrStationParam * @return NONE * @author * @date * @version 1.0 */ -static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler, tstrWILC_AddStaParam *pstrStationParam) +static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler, + struct add_sta_param *pstrStationParam) { s32 s32Error = 0; tstrWID strWID; @@ -3722,13 +3724,14 @@ ERRORHANDLER: /** * @brief Handle_EditStation * @details Sending config packet to edit station - * @param[in] tstrWILC_AddStaParam* pstrStationParam + * @param[in] struct add_sta_param *pstrStationParam * @return NONE * @author * @date * @version 1.0 */ -static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler, tstrWILC_AddStaParam *pstrStationParam) +static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler, + struct add_sta_param *pstrStationParam) { s32 s32Error = 0; tstrWID strWID; @@ -7012,18 +7015,19 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv) /** * @brief host_int_add_station * @details Setting add station params in message queue - * @param[in] WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* pstrStaParams + * @param[in] WILC_WFIDrvHandle hWFIDrv, struct add_sta_param *pstrStaParams * @return Error code. * @author * @date * @version 1.0 */ -s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams) +s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, + struct add_sta_param *pstrStaParams) { s32 s32Error = 0; tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_msg msg; - tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam; + struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam; if (pstrWFIDrv == NULL) { @@ -7040,7 +7044,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta msg.id = HOST_IF_MSG_ADD_STATION; msg.drvHandler = hWFIDrv; - memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam)); + memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param)); if (pstrAddStationMsg->u8NumRates > 0) { u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL); @@ -7162,18 +7166,19 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]) /** * @brief host_int_edit_station * @details Setting edit station params in message queue - * @param[in] WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* pstrStaParams + * @param[in] WILC_WFIDrvHandle hWFIDrv, struct add_sta_param *pstrStaParams * @return Error code. * @author * @date * @version 1.0 */ -s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams) +s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, + struct add_sta_param *pstrStaParams) { s32 s32Error = 0; tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_msg msg; - tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam; + struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam; if (pstrWFIDrv == NULL) { PRINT_ER("driver is null\n"); @@ -7189,7 +7194,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt msg.id = HOST_IF_MSG_EDIT_STATION; msg.drvHandler = hWFIDrv; - memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam)); + memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param)); if (pstrAddStationMsg->u8NumRates > 0) { u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL); diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 537845e9d077..b24eeb6841cb 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -369,7 +369,7 @@ typedef enum { WILC_STA_FLAG_AUTHENTICATED /*!< station is authenticated*/ } tenuWILC_StaFlag; -typedef struct { +struct add_sta_param { u8 au8BSSID[ETH_ALEN]; u16 u16AssocID; u8 u8NumRates; @@ -383,7 +383,7 @@ typedef struct { u8 u8ASELCap; u16 u16FlagsMask; /**/ u16 u16FlagsSet; /*