staging: wilc1000: remove typedef from tstrCfgParamVal

This patch removes typedef from the struct tstrCfgParamVal.
And rename it to cfg_param_val.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 50426bfc008bee97dc9ed2fc033d0eefbec65f9c..8c2ececf3699cdee84e00b353faad82d129e7b06 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -72,7 +72,7 @@ extern u8 g_wilc_initialized;
  *  @version           1.0
  */
 struct cfg_param_attr {
-       tstrCfgParamVal pstrCfgParamVal;
+       struct cfg_param_val pstrCfgParamVal;
 };
 
 /*!
@@ -5782,7 +5782,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
  *  @date              8 March 2012
  *  @version           1.0
  */
-s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal)
+s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal)
 {
 
        s32 s32Error = 0;

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 460c73bd7cc8ed11c9cb6b7f69ad5d3dac413ab6..69c5a946fda134d85e8d62d5698d7bd54bb3d296 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -109,7 +109,7 @@ typedef enum {
        MBPS_54         = 54
 } CURRENT_TX_RATE_T;
 
-typedef struct {
+struct cfg_param_val {
        u32 u32SetCfgFlag;
        u8 ht_enable;
        u8 bss_type;
@@ -132,7 +132,7 @@ typedef struct {
        u16 passive_scan_time;
        CURRENT_TX_RATE_T curr_tx_rate;
 
-} tstrCfgParamVal;
+};
 
 typedef enum {
        RETRY_SHORT             = BIT(0),
@@ -319,7 +319,7 @@ typedef struct {
        tenuHostIFstate enuHostIFstate;
 
        u8 au8AssociatedBSSID[ETH_ALEN];
-       tstrCfgParamVal strCfgValues;
+       struct cfg_param_val strCfgValues;
 /* semaphores */
        struct semaphore gtOsCfgValuesSem;
        struct semaphore hSemTestKeyBlock;
@@ -885,7 +885,7 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
  *  @date              8 March 2012
  *  @version           1.0
  */
-s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, tstrCfgParamVal *pstrCfgParamVal);
+s32 hif_set_cfg(tstrWILC_WFIDrv *hWFIDrv, struct cfg_param_val *pstrCfgParamVal);
 
 /**
  *  @brief              gets configuration wids values

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 8068a7e591c25ad0ea15d80d783044bc3d592b6a..5905040e98fac1690c3869b42916d10710bb3a36 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1742,7 +1742,7 @@ static int  WILC_WFI_disassoc(struct wiphy *wiphy, struct net_device *dev,
 static int set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
        s32 s32Error = 0;
-       tstrCfgParamVal pstrCfgParamVal;
+       struct cfg_param_val pstrCfgParamVal;
        struct wilc_priv *priv;
 
        priv = wiphy_priv(wiphy);