commit 08aa776429fc8dce89c525f927c996c4a39a7de0
author Abhishek Singh <absingh@qti.qualcomm.com> Tue Dec 16 13:59:03 2014 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Tue Dec 16 18:32:28 2014 +0530
tree 363b655c2f81ab5ddf4af30677a2afd105fec125
parent 78850689b9f49af6421d06d07a52ca0f95003f8c

wlan: UBSP Stats: Avoid using void arguments and use global structures.

Same structured are used in HDD and SME layers so instead of defining
them in all layer define them globaly so that they can be used by
all layer.
Also avoid using void arguments in the functions.

CRs-fixed: 771074
Change-Id: Ibbf5c71b81484793ae96800025629d2056108805

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 635fdf1..73bd3aa 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1964,15 +1964,15 @@
     return;
 }
 
-void hdd_FWStatisCB( VOS_STATUS status, void *fwStats, void *data )
+void hdd_FWStatisCB( VOS_STATUS status,
+     tSirFwStatsResult *fwStatsResult, void *pContext )
 {
     fwStatsContext_t *fwStatsCtx;
-    fwStatsResult_t  *fwStatsResult;
     hdd_adapter_t *pAdapter;
 
     hddLog(VOS_TRACE_LEVEL_INFO, FL(" with status = %d"),status);
 
-    if (NULL == data)
+    if (NULL == pContext)
     {
         hddLog(VOS_TRACE_LEVEL_ERROR, FL("argument data is NULL"));
         return;
@@ -1982,7 +1982,7 @@
        before or while this code is executing.  we use a spinlock to
        serialize these actions */
     spin_lock(&hdd_context_lock);
-    fwStatsCtx = (fwStatsContext_t *) data;
+    fwStatsCtx = (fwStatsContext_t *) pContext;
     if (fwStatsCtx->magic != FW_STATS_CONTEXT_MAGIC)
     {
         hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -1999,19 +1999,17 @@
         return;
     }
     pAdapter->fwStatsRsp.type = 0;
-    if ((VOS_STATUS_SUCCESS == status) && (NULL != fwStats))
+    if ((VOS_STATUS_SUCCESS == status) && (NULL != fwStatsResult))
     {
-        fwStatsResult = (fwStatsResult_t *)fwStats;
         switch( fwStatsResult->type )
         {
             case FW_UBSP_STATS:
             {
-                 memcpy(&pAdapter->fwStatsRsp,fwStatsResult,sizeof(fwStatsResult_t));
-
+                 memcpy(&pAdapter->fwStatsRsp,fwStatsResult,sizeof(tSirFwStatsResult));
                  hddLog(VOS_TRACE_LEVEL_INFO,
                   FL("ubsp_enter_cnt = %d ubsp_jump_ddr_cnt = %d"),
-                  pAdapter->fwStatsRsp.hddFwStatsData.ubspStats.ubsp_enter_cnt,
-                  pAdapter->fwStatsRsp.hddFwStatsData.ubspStats.ubsp_jump_ddr_cnt);
+                  pAdapter->fwStatsRsp.fwStatsData.ubspStats.ubsp_enter_cnt,
+                  pAdapter->fwStatsRsp.fwStatsData.ubspStats.ubsp_jump_ddr_cnt);
             }
             break;
             default:
@@ -4232,7 +4230,7 @@
            char len;
            long waitRet;
            fwStatsContext_t fwStatsCtx;
-           fwStatsResult_t *fwStatsRsp = &(pAdapter->fwStatsRsp);
+           tSirFwStatsResult *fwStatsRsp = &(pAdapter->fwStatsRsp);
            tANI_U8 *ptr = command;
            int stats = *(ptr + 11) - '0';
 
@@ -4258,7 +4256,7 @@
            fwStatsCtx.pAdapter = pAdapter;
            fwStatsRsp->type = 0;
            status = sme_GetFwStats( (tHalHandle)pHddCtx->hHal, stats,
-                                   (&fwStatsCtx), hdd_FWStatisCB);
+                                   &fwStatsCtx, hdd_FWStatisCB);
            if (eHAL_STATUS_SUCCESS != status)
            {
                hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -4295,8 +4293,8 @@
                    {
                         len = snprintf(buf, FW_STATE_RSP_LEN,
                               "GETFWSTATS: ubsp_enter_cnt %d ubsp_jump_ddr_cnt %d",
-                              fwStatsRsp->hddFwStatsData.ubspStats.ubsp_enter_cnt,
-                              fwStatsRsp->hddFwStatsData.ubspStats.ubsp_jump_ddr_cnt);
+                              fwStatsRsp->fwStatsData.ubspStats.ubsp_enter_cnt,
+                              fwStatsRsp->fwStatsData.ubspStats.ubsp_jump_ddr_cnt);
                    }
                    break;
                    default: