From 430a78cf77236e5cdb514459ffb38609bd9c10b1 Mon Sep 17 00:00:00 2001 From: Leo Kim Date: Mon, 5 Oct 2015 15:25:48 +0900 Subject: [PATCH] staging: wilc1000: remove typedef from CURRENT_TX_RATE_T This patch remove typedef from the enum CURRENT_TX_RATE_T. And rename it to CURRENT_TXRATE. Signed-off-by: Leo Kim Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 2 +- drivers/staging/wilc1000/host_interface.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 8c2ececf3699..07ce4b88aa4e 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1155,7 +1155,7 @@ static s32 Handle_CfgParam(tstrWILC_WFIDrv *drvHandler, u8WidCnt++; } if (strHostIFCfgParamAttr->pstrCfgParamVal.u32SetCfgFlag & CURRENT_TX_RATE) { - CURRENT_TX_RATE_T curr_tx_rate = strHostIFCfgParamAttr->pstrCfgParamVal.curr_tx_rate; + enum CURRENT_TXRATE curr_tx_rate = strHostIFCfgParamAttr->pstrCfgParamVal.curr_tx_rate; /*----------------------------------------------------------------------*/ /*Rates: 1 2 5.5 11 6 9 12 18 24 36 48 54 Auto */ /*InputValues: 1 2 3 4 5 6 7 8 9 10 11 12 0 */ diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 1ed21a20b70f..5993cd8f210f 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -93,7 +93,7 @@ struct host_if_pmkid_attr { struct host_if_pmkid pmkidlist[WILC_MAX_NUM_PMKIDS]; }; -typedef enum { +enum CURRENT_TXRATE { AUTORATE = 0, MBPS_1 = 1, MBPS_2 = 2, @@ -107,7 +107,7 @@ typedef enum { MBPS_36 = 36, MBPS_48 = 48, MBPS_54 = 54 -} CURRENT_TX_RATE_T; +}; struct cfg_param_val { u32 u32SetCfgFlag; @@ -130,7 +130,7 @@ struct cfg_param_val { u8 scan_source; u16 active_scan_time; u16 passive_scan_time; - CURRENT_TX_RATE_T curr_tx_rate; + enum CURRENT_TXRATE curr_tx_rate; }; -- 2.34.1