[PATCH 02/18] staging: wilc1000: remove typedef from tstrHiddenNetwork

[Tony Cho]

From: Leo Kim <leo....@atmel.com>

This patch removes typedef from the struct tstrHiddenNetwork.
And, rename it to hidden_network.

Signed-off-by: Leo Kim <leo....@atmel.com>
Signed-off-by: Tony Cho <tony....@atmel.com>
---
 drivers/staging/wilc1000/host_interface.c         | 5 +++--
 drivers/staging/wilc1000/host_interface.h         | 8 ++++----
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c 
b/drivers/staging/wilc1000/host_interface.c
index 86fa968..b9b57ca 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -169,7 +169,7 @@ struct scan_attr {
        size_t IEsLen;
        wilc_scan_result pfScanResult;
        void *pvUserArg;
-       tstrHiddenNetwork strHiddenNetwork;
+       struct hidden_network strHiddenNetwork;
 };
 
 /*!
@@ -5716,7 +5716,8 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 
u8ScanSource,
                          u8 u8ScanType, u8 *pu8ChnlFreqList,
                          u8 u8ChnlListLen, const u8 *pu8IEs,
                          size_t IEsLen, wilc_scan_result ScanResult,
-                         void *pvUserArg, tstrHiddenNetwork  
*pstrHiddenNetwork)
+                         void *pvUserArg,
+                         struct hidden_network *pstrHiddenNetwork)
 {
        s32 s32Error = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
diff --git a/drivers/staging/wilc1000/host_interface.h 
b/drivers/staging/wilc1000/host_interface.h
index c9ea34e..458b1e1 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -219,12 +219,11 @@ typedef struct _tstrHiddenNetworkInfo {
 
 } tstrHiddenNetworkInfo;
 
-typedef struct _tstrHiddenNetwork {
+struct hidden_network {
        /* MAX_SSID_LEN */
        tstrHiddenNetworkInfo *pstrHiddenNetworkInfo;
        u8 u8ssidnum;
-
-} tstrHiddenNetwork;
+};
 
 typedef struct {
        /* Scan user call back function */
@@ -873,7 +872,8 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource,
                          u8 u8ScanType, u8 *pu8ChnlFreqList,
                          u8 u8ChnlListLen, const u8 *pu8IEs,
                          size_t IEsLen, wilc_scan_result ScanResult,
-                         void *pvUserArg, tstrHiddenNetwork 
*pstrHiddenNetwork);
+                         void *pvUserArg,
+                         struct hidden_network *pstrHiddenNetwork);
 /**
  *  @brief              sets configuration wids values
  *  @details
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 04838f1..f3720e7 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -698,7 +698,7 @@ static int scan(struct wiphy *wiphy, struct 
cfg80211_scan_request *request)
        u32 i;
        s32 s32Error = 0;
        u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];
-       tstrHiddenNetwork strHiddenNetwork;
+       struct hidden_network strHiddenNetwork;
 
        priv = wiphy_priv(wiphy);
 
@@ -727,7 +727,7 @@ static int scan(struct wiphy *wiphy, struct 
cfg80211_scan_request *request)
                if (request->n_ssids >= 1) {
 
 
-                       strHiddenNetwork.pstrHiddenNetworkInfo = 
kmalloc(request->n_ssids * sizeof(tstrHiddenNetwork), GFP_KERNEL);
+                       strHiddenNetwork.pstrHiddenNetworkInfo = 
kmalloc(request->n_ssids * sizeof(struct hidden_network), GFP_KERNEL);
                        strHiddenNetwork.u8ssidnum = request->n_ssids;
 
 
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel