wlan: Cleanup North-Bound load/unload logs

If IOCTLs or CFG callbacks are issued continiously during driver
load/unload or during SSR, observing stability issues because of
excessive logging.
Hence move log level to INFO from ERROR in wlan_hdd_validate_context
function and don't print return status in its caller functions.

Change-Id: I8fd9b25e0c774e1e12b01128eb86783c9dec2ab7
CRs-Fixed: 800631
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index b5e1286..0c63d15 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2795,6 +2795,8 @@
     hdd_context_t *pHddCtx = NULL;
     int ret;
 
+    ENTER();
+
     if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
         hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -2807,8 +2809,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               "%s: HDD context is not valid",__func__);
         return;
     }
 
@@ -2816,6 +2816,8 @@
     {
         sme_RequestBmps(WLAN_HDD_GET_HAL_CTX(pAdapter), NULL, NULL);
     }
+
+    EXIT();
 }
 
 eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U32 roamId,
@@ -3697,8 +3699,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -3888,6 +3888,7 @@
    hdd_wext_state_t *wextBuf;
    hdd_station_ctx_t *pHddStaCtx;
    int ret = 0;
+
    ENTER();
 
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -3902,8 +3903,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -3991,8 +3990,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -4257,8 +4254,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -4417,6 +4412,7 @@
     hdd_context_t *pHddCtx;
     v_U8_t  *pMacAddress = NULL;
     int ret = 0;
+
     ENTER();
 
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -4430,8 +4426,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               "%s: HDD context is not valid",__func__);
         return ret;
     }
     pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -4446,8 +4440,8 @@
     VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s "MAC_ADDRESS_STR,
               __func__, MAC_ADDR_ARRAY(pMacAddress));
     vos_mem_copy( pHddStaCtx->conn_info.bssId, pMacAddress, sizeof( tCsrBssid ));
-    EXIT();
 
+    EXIT();
     return 0;
 }
 
@@ -4483,6 +4477,7 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
     int ret = 0;
+
     ENTER();
 
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -4496,8 +4491,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               "%s: HDD context is not valid",__func__);
         return ret;
     }
     pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 4f98626..dc072d8 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1089,11 +1089,11 @@
     struct sk_buff *vendor_event;
     int status, i;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid") );
         return;
     }
 
@@ -1239,6 +1239,8 @@
     }
     nla_nest_end(vendor_event, peerInfo);
     cfg80211_vendor_event(vendor_event, GFP_KERNEL);
+
+    EXIT();
 }
 
 /*
@@ -1255,11 +1257,11 @@
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     int status;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid") );
         return;
     }
     /*
@@ -1392,6 +1394,8 @@
     }
 
     cfg80211_vendor_event(vendor_event, GFP_KERNEL);
+
+    EXIT();
 }
 
 /*
@@ -1410,11 +1414,11 @@
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     struct nlattr *chList;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid") );
         return;
     }
     pWifiRadioStat = (tpSirWifiRadioStat) pData;
@@ -1570,6 +1574,8 @@
     nla_nest_end(vendor_event, chList);
 
     cfg80211_vendor_event(vendor_event, GFP_KERNEL);
+
+    EXIT();
     return;
 }
 
@@ -1587,17 +1593,14 @@
     tpSirLLStatsResults linkLayerStatsResults = (tpSirLLStatsResults)pRsp;
     int status;
 
-    status = wlan_hdd_validate_context(pHddCtx);
+    ENTER();
 
+    status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return;
     }
 
-
-
     pAdapter = hdd_get_adapter_by_macaddr(pHddCtx, macAddr);
     if (NULL == pAdapter)
     {
@@ -1660,6 +1663,8 @@
             hddLog(VOS_TRACE_LEVEL_ERROR, "invalid event type %d", indType);
             break;
     }
+
+    EXIT();
     return;
 }
 
@@ -1686,11 +1691,11 @@
     hdd_context_t *pHddCtx = wiphy_priv(wiphy);
     hdd_station_ctx_t *pHddStaCtx;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
 
@@ -1789,6 +1794,7 @@
 
     pAdapter->isLinkLayerStatsSet = 1;
 
+    EXIT();
     return 0;
 }
 static int wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
@@ -1834,11 +1840,11 @@
     hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     int status;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL ;
     }
 
@@ -1914,6 +1920,8 @@
                "sme_LLStatsGetReq Failed", __func__);
         return -EINVAL;
     }
+
+    EXIT();
     return 0;
 }
 
@@ -1955,11 +1963,11 @@
     u8 stopReq;
     int status;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
 
@@ -2083,6 +2091,8 @@
         }
         return -ENOMEM;
     }
+
+    EXIT();
     return -EINVAL;
 }
 static int wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
@@ -2164,12 +2174,18 @@
     tpSirEXTScanCapabilitiesEvent pData =
                     (tpSirEXTScanCapabilitiesEvent) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx))
+    {
         return;
     }
 
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
+        return;
+    }
     skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
                         EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
                         QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_CAPABILITIES_INDEX,
@@ -2227,6 +2243,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2242,10 +2259,14 @@
     struct sk_buff *skb            = NULL;
     tpAniSirGlobal pMac = PMAC_STRUCT( pHddCtx->hHal );
 
+    ENTER();
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    if (wlan_hdd_validate_context(pHddCtx)){
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2285,6 +2306,7 @@
 
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2299,9 +2321,14 @@
     hdd_context_t *pHddCtx        = (hdd_context_t *)ctx;
     struct sk_buff *skb           = NULL;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)){
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2326,6 +2353,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2342,11 +2370,17 @@
     tpSirEXTScanSetBssidHotListRspParams pData =
                     (tpSirEXTScanSetBssidHotListRspParams) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)){
         return;
     }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
+        return;
+    }
+
     skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
                       EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN,
                       QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SET_BSSID_HOTLIST_INDEX,
@@ -2369,6 +2403,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2384,9 +2419,14 @@
     tpSirEXTScanResetBssidHotlistRspParams pData =
                     (tpSirEXTScanResetBssidHotlistRspParams) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2411,6 +2451,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2427,9 +2468,14 @@
     tpSirEXTScanSetSignificantChangeRspParams pData =
                     (tpSirEXTScanSetSignificantChangeRspParams) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2455,6 +2501,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2471,9 +2518,14 @@
     tpSirEXTScanResetSignificantChangeRspParams pData =
                     (tpSirEXTScanResetSignificantChangeRspParams) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2499,6 +2551,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2516,11 +2569,17 @@
     tpSirWifiScanResultEvent pData = (tpSirWifiScanResultEvent) pMsg;
     tpSirWifiScanResult pSirWifiScanResult;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
         return;
     }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
+        return;
+    }
+
     totalResults = pData->numOfAps;
     hddLog(VOS_TRACE_LEVEL_INFO, "Req Id (%u)", pData->requestId);
     hddLog(VOS_TRACE_LEVEL_INFO, "Num results (%u)", pData->numOfAps);
@@ -2659,6 +2718,7 @@
         cfg80211_vendor_event(skb, GFP_KERNEL);
     } while (totalResults > 0);
 
+    EXIT();
     return;
 fail:
     kfree_skb(skb);
@@ -2673,9 +2733,14 @@
     struct sk_buff *skb            = NULL;
     tANI_U32 i;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2771,6 +2836,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 fail:
@@ -2787,11 +2853,17 @@
     tpSirWifiSignificantChangeEvent pData =
                                      (tpSirWifiSignificantChangeEvent) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
         return;
     }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
+        return;
+    }
+
     skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy,
                     EXTSCAN_EVENT_BUF_SIZE,
                     QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_SIGNIFICANT_CHANGE_INDEX,
@@ -2869,6 +2941,7 @@
             goto fail;
     }
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 fail:
     kfree_skb(skb);
@@ -2883,9 +2956,14 @@
     tpSirWifiFullScanResultEvent pData =
         (tpSirWifiFullScanResultEvent) (pMsg);
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                    "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)) {
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -2961,6 +3039,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -2976,9 +3055,14 @@
     tpSirEXTScanResultsAvailableIndParams pData =
                     (tpSirEXTScanResultsAvailableIndParams) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)){
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -3007,6 +3091,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -3021,9 +3106,14 @@
     tpSirEXTScanProgressIndParams pData =
                                    (tpSirEXTScanProgressIndParams) pMsg;
 
-    if (wlan_hdd_validate_context(pHddCtx) || !pData) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "
-                                         "or pData(%p) is null"), pData);
+    ENTER();
+
+    if (wlan_hdd_validate_context(pHddCtx)){
+        return;
+    }
+    if (!pMsg)
+    {
+        hddLog(VOS_TRACE_LEVEL_ERROR, FL("pMsg is null"));
         return;
     }
 
@@ -3056,6 +3146,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return;
 
 nla_put_failure:
@@ -3068,8 +3159,9 @@
 {
     hdd_context_t *pHddCtx = (hdd_context_t *)ctx;
 
+    ENTER();
+
     if (wlan_hdd_validate_context(pHddCtx)) {
-        hddLog(VOS_TRACE_LEVEL_INFO, FL("HDD context is not valid"));
         return;
     }
 
@@ -3130,6 +3222,7 @@
         hddLog(VOS_TRACE_LEVEL_ERROR, FL("invalid event type %d "), evType);
         break;
     }
+    EXIT();
 }
 
 static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
@@ -3144,12 +3237,11 @@
         *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1];
     eHalStatus status;
 
-    hddLog(VOS_TRACE_LEVEL_INFO, FL("Entering"));
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -3188,7 +3280,7 @@
                FL("sme_EXTScanGetCapabilities failed(err=%d)"), status);
         return -EINVAL;
     }
-
+    EXIT();
     return 0;
 }
 
@@ -3217,11 +3309,11 @@
             *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1];
     eHalStatus status;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -3271,6 +3363,7 @@
                FL("sme_getCachedResults failed(err=%d)"), status);
         return -EINVAL;
     }
+    EXIT();
     return 0;
 
 failed:
@@ -3306,11 +3399,11 @@
     tANI_U8 i = 0;
     int rem;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -3417,7 +3510,7 @@
     }
 
     vos_mem_free(pReqMsg);
-
+    EXIT();
     return 0;
 
 fail:
@@ -3456,11 +3549,11 @@
     int i = 0;
     int rem;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -3598,7 +3691,7 @@
         return -EINVAL;
     }
     vos_mem_free(pReqMsg);
-    hddLog(VOS_TRACE_LEVEL_ERROR, FL(" Exiting"));
+    EXIT();
     return 0;
 
 fail:
@@ -3633,13 +3726,13 @@
     eHalStatus status;
     struct sk_buff *replySkb;
     tANI_U8 i;
+    int ret;
 
-    hddLog(VOS_TRACE_LEVEL_INFO, FL("Entering"));
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -3709,7 +3802,10 @@
         return -EINVAL;
     }
 
-    return cfg80211_vendor_cmd_reply(replySkb);
+    ret = cfg80211_vendor_cmd_reply(replySkb);
+
+    EXIT();
+    return ret;
 }
 
 static int wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
@@ -3744,11 +3840,11 @@
     eHalStatus status;
     tANI_U32 j = 0, index = 0;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -3957,6 +4053,7 @@
     }
 
     vos_mem_free(pReqMsg);
+    EXIT();
     return 0;
 
 fail:
@@ -3988,11 +4085,11 @@
     struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1];
     eHalStatus status;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -4031,6 +4128,7 @@
         return -EINVAL;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -4058,11 +4156,11 @@
     struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1];
     eHalStatus status;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -4100,7 +4198,7 @@
                           FL("sme_ResetBssHotlist failed(err=%d)"), status);
         return -EINVAL;
     }
-
+    EXIT();
     return 0;
 }
 
@@ -4129,12 +4227,11 @@
     struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1];
     eHalStatus status;
 
-    hddLog(VOS_TRACE_LEVEL_INFO, FL(" Entering"));
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     /* check the EXTScan Capability */
@@ -4174,7 +4271,7 @@
         return -EINVAL;
     }
 
-    hddLog(VOS_TRACE_LEVEL_ERROR, FL(" Exiting"));
+    EXIT();
     return 0;
 }
 
@@ -4256,8 +4353,9 @@
     hdd_context_t *pHddCtx      = wiphy_priv(wiphy);
     struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_SET_SCANNING_MAC_OUI_MAX + 1];
 
+    ENTER();
+
     if (0 != wlan_hdd_validate_context(pHddCtx)){
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("hdd Ctx invalid while spoof macAddr"));
         return -EINVAL;
     }
     if (FALSE == pHddCtx->cfg_ini->enableMacSpoofing) {
@@ -4305,6 +4403,7 @@
         hddLog(LOGE, FL("Failed to send Spoof Mac Addr to FW"));
     }
 
+    EXIT();
     return 0;
 }
 
@@ -4338,10 +4437,12 @@
     tANI_S32 global_operating_class = 0;
     tANI_S32 channel = 0;
     struct sk_buff *skb         = NULL;
+    int retVal;
+
+    ENTER();
 
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret) {
-
         return -EINVAL;
     }
     if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
@@ -4405,7 +4506,9 @@
         goto nla_put_failure;
     }
 
-    return cfg80211_vendor_cmd_reply(skb);
+    retVal = cfg80211_vendor_cmd_reply(skb);
+    EXIT();
+    return retVal;
 
 nla_put_failure:
     kfree_skb(skb);
@@ -4437,8 +4540,9 @@
     tANI_S32 global_operating_class = 0;
     tANI_S32 channel = 0;
 
+    ENTER();
+
     if (wlan_hdd_validate_context(pHddCtx)) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "));
         return -EINVAL;
     }
 
@@ -4487,6 +4591,7 @@
     }
 
     cfg80211_vendor_event(skb, GFP_KERNEL);
+    EXIT();
     return (0);
 
 nla_put_failure:
@@ -4506,11 +4611,12 @@
     struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX + 1];
     eHalStatus status;
     tdls_req_params_t   pReqMsg = {0};
+    int ret;
+
+    ENTER();
 
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status) {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
@@ -4575,10 +4681,13 @@
     hddLog(VOS_TRACE_LEVEL_INFO, FL("Bandwidth (%d)"),
                                      pReqMsg.min_bandwidth_kbps);
 
-    return (wlan_hdd_tdls_extctrl_config_peer(pAdapter,
+    ret = wlan_hdd_tdls_extctrl_config_peer(pAdapter,
                                  peer,
                                  &pReqMsg,
-                                 wlan_hdd_cfg80211_exttdls_callback));
+                                 wlan_hdd_cfg80211_exttdls_callback);
+
+    EXIT();
+    return ret;
 }
 
 static int wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy,
@@ -4606,11 +4715,12 @@
     hdd_context_t *pHddCtx                     = wiphy_priv(wiphy);
     struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1];
     eHalStatus status;
+    int ret;
+
+    ENTER();
 
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status) {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
@@ -4634,7 +4744,10 @@
                 sizeof(peer));
     hddLog(VOS_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR),MAC_ADDR_ARRAY(peer));
 
-    return (wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer));
+    ret = wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer);
+
+    EXIT();
+    return ret;
 }
 
 static int wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
@@ -4663,12 +4776,11 @@
     tANI_U32       fset         = 0;
     int ret = 0;
 
+    ENTER();
 
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid (%d)",__func__, ret);
         return ret;
     }
     if (wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) {
@@ -4763,7 +4875,9 @@
         goto nla_put_failure;
     }
 
-    return cfg80211_vendor_cmd_reply(skb);
+    ret = cfg80211_vendor_cmd_reply(skb);
+    EXIT();
+    return ret;
 
 nla_put_failure:
     kfree_skb(skb);
@@ -4801,8 +4915,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid, ret = %d",__func__, ret);
         return ret;
     }
 
@@ -4864,7 +4976,9 @@
             return -EINVAL;
         }
 
-        return cfg80211_vendor_cmd_reply(reply_skb);
+        ret = cfg80211_vendor_cmd_reply(reply_skb);
+        EXIT();
+        return ret;
     }
     hddLog(LOGE, FL("Feature set matrix: buffer alloc fail"));
     return -ENOMEM;
@@ -4910,10 +5024,10 @@
     eHalStatus status;
     u32 dfsFlag = 0;
 
+    ENTER();
+
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status) {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid"));
         return -EINVAL;
     }
     if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_SET_NO_DFS_FLAG_MAX,
@@ -4938,6 +5052,8 @@
 
     sme_disable_dfs_channel(hHal, dfsFlag);
     sme_FilterScanResults(hHal, pAdapter->sessionId);
+
+    EXIT();
     return 0;
 }
 
@@ -4974,10 +5090,10 @@
     v_U32_t isFwrRoamEnabled = FALSE;
     int ret;
 
+    ENTER();
+
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret) {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               FL("HDD context is not valid, ret = %d"), ret);
         return ret;
     }
 
@@ -5013,6 +5129,7 @@
 
     //Update roaming
     status = sme_ConfigFwrRoaming((tHalHandle)(pHddCtx->hHal), isFwrRoamEnabled);
+    EXIT();
     return status;
 }
 
@@ -6440,7 +6557,6 @@
 
     ENTER();
 
-
     if( NULL == dev )
     {
         hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -6459,11 +6575,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -7091,11 +7204,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -7161,6 +7271,7 @@
     int status;
 
     ENTER();
+
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                      TRACE_CODE_HDD_CFG80211_SET_BEACON,
                      pAdapter->sessionId, pHddStaCtx->conn_info.authType));
@@ -7170,11 +7281,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -7255,11 +7363,8 @@
                      pAdapter->sessionId, pAdapter->device_mode));
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -7450,11 +7555,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -7543,11 +7645,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -7616,12 +7715,9 @@
         return -ENODEV;
     }
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return ret;
     }
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
@@ -7712,11 +7808,8 @@
                      TRACE_CODE_HDD_CFG80211_CHANGE_IFACE,
                      pAdapter->sessionId, type));
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -8323,6 +8416,7 @@
 #endif
 
     ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if ((NULL == pAdapter))
     {
@@ -8339,8 +8433,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return ret;
     }
 
@@ -8532,11 +8624,8 @@
                       pAdapter->sessionId, params->key_len));
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -8880,7 +8969,7 @@
      * variable.
      */
     vos_mem_zero(&setKey, sizeof(setKey));
-
+    EXIT();
     return status;
 }
 
@@ -8954,8 +9043,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return ret;
     }
 
@@ -9012,6 +9099,7 @@
     params.seq = NULL;
     params.key = &pRoamProfile->Keys.KeyMaterial[key_index][0];
     callback(cookie, &params);
+    EXIT();
     return 0;
 }
 
@@ -9242,11 +9330,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -9330,7 +9415,7 @@
             pAPCtx->wepKey[key_index].keyDirection = eSIR_TX_DEFAULT;
         }
     }
-
+    EXIT();
     return status;
 }
 
@@ -9468,22 +9553,12 @@
     struct timespec ts;
 #endif
 
+    ENTER();
+
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
-    /*bss_update is not allowed during wlan driver loading or unloading*/
-    if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
-    {
-         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                    "%s:Loading_unloading in Progress. Ignore!!!",__func__);
-         return NULL;
-    }
-
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return NULL;
     }
 
@@ -9604,6 +9679,7 @@
     bss_status = cfg80211_inform_bss_frame(wiphy, chan, mgmt,
             frame_len, rssi, GFP_KERNEL);
     kfree(mgmt);
+    EXIT();
     return bss_status;
 }
 
@@ -10220,17 +10296,13 @@
 
     ENTER();
 
-
     hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %s (%d)",
            __func__, hdd_device_modetoString(pAdapter->device_mode),
                                              pAdapter->device_mode);
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -10654,7 +10726,6 @@
       vos_mem_free( channelList );
 
     EXIT();
-
     return status;
 }
 
@@ -10741,8 +10812,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (status)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid!", __func__);
         return status;
     }
 
@@ -11743,11 +11812,8 @@
     }
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -11848,12 +11914,11 @@
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     long ret;
 
-    status = wlan_hdd_validate_context(pHddCtx);
+    ENTER();
 
+    status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -11925,6 +11990,7 @@
               FL("Set HDD connState to eConnectionState_NotConnected"));
     pHddStaCtx->conn_info.connState = eConnectionState_NotConnected;
 
+    EXIT();
     return result;
 }
 
@@ -11961,11 +12027,8 @@
             __func__, reason);
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -12050,6 +12113,7 @@
         hddLog(VOS_TRACE_LEVEL_ERROR, "%s: No valid roam profile", __func__);
     }
 
+    EXIT();
     return status;
 }
 
@@ -12181,11 +12245,8 @@
                                    pAdapter->device_mode);
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -12329,6 +12390,7 @@
     {
         vos_mem_free(params->bssid);
     }
+    EXIT();
     return 0;
 }
 
@@ -12366,11 +12428,8 @@
                      TRACE_CODE_HDD_CFG80211_LEAVE_IBSS,
                       pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE));
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -12399,6 +12458,7 @@
     sme_RoamDisconnect( WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId,
                                   eCSR_DISCONNECT_REASON_IBSS_LEAVE);
 
+    EXIT();
     return 0;
 }
 
@@ -12428,15 +12488,14 @@
     int status;
 
     ENTER();
-     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
+
+    MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                       TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS,
                        NO_SESSION, wiphy->rts_threshold));
-    status = wlan_hdd_validate_context(pHddCtx);
 
+    status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -12543,6 +12602,7 @@
         }
     }
 
+    EXIT();
     return 0;
 }
 
@@ -12580,15 +12640,13 @@
     int status;
 
     ENTER();
+
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                       TRACE_CODE_HDD_CFG80211_SET_TXPOWER,
                       NO_SESSION, type ));
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -12629,6 +12687,7 @@
        return -EIO;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -12678,11 +12737,8 @@
     ENTER();
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         *dbm = 0;
         return status;
     }
@@ -12772,11 +12828,8 @@
     }
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -13211,11 +13264,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -13243,13 +13293,13 @@
      **/
     vos_status =  wlan_hdd_enter_bmps(pAdapter, !mode);
 
-    EXIT();
     if (VOS_STATUS_E_FAILURE == vos_status)
     {
          VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                    "%s: failed to enter bmps mode", __func__);
         return -EINVAL;
     }
+    EXIT();
     return 0;
 }
 
@@ -13338,6 +13388,7 @@
     v_U8_t staId;
     v_CONTEXT_t pVosContext = NULL;
     ptSapContext pSapCtx = NULL;
+
     ENTER();
 
     if ( NULL == pAdapter )
@@ -13352,11 +13403,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -13490,6 +13538,7 @@
     u32 mask, set;
 
     ENTER();
+
     pAdapter =  WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -13501,8 +13550,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return status;
     }
 
@@ -13525,6 +13572,7 @@
         }
     }
 #endif
+    EXIT();
     return status;
 }
 
@@ -13551,6 +13599,8 @@
     hdd_context_t *pHddCtx;
     tPmkidCacheInfo pmk_id;
 
+    ENTER();
+
     // Validate pAdapter
     if ( NULL == pAdapter )
     {
@@ -13574,11 +13624,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -13596,6 +13643,7 @@
                      TRACE_CODE_HDD_CFG80211_SET_PMKSA,
                      pAdapter->sessionId, result));
 
+    EXIT();
     return HAL_STATUS_SUCCESS(result) ? 0 : -EINVAL;
 }
 
@@ -13620,6 +13668,8 @@
     hdd_context_t *pHddCtx;
     int status = 0;
 
+    ENTER();
+
     /* Validate pAdapter */
     if (NULL == pAdapter)
     {
@@ -13642,11 +13692,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -13662,7 +13709,8 @@
         status = -EINVAL;
     }
 
-   return status;
+    EXIT();
+    return status;
 }
 
 
@@ -13686,7 +13734,7 @@
     hdd_context_t *pHddCtx;
     int status = 0;
 
-    hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: flushing PMKSA ",__func__);
+    ENTER();
 
     /* Validate pAdapter */
     if (NULL == pAdapter)
@@ -13698,11 +13746,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-       hddLog(VOS_TRACE_LEVEL_ERROR,
-              "%s: HDD context is not valid", __func__);
        return status;
     }
 
@@ -13715,7 +13760,7 @@
         hddLog(VOS_TRACE_LEVEL_ERROR, FL("Cannot flush PMKIDCache"));
         status = -EINVAL;
     }
-
+    EXIT();
     return status;
 }
 
@@ -13741,6 +13786,8 @@
     hdd_context_t *pHddCtx;
     int ret = 0;
 
+    ENTER();
+
     if (NULL == pAdapter)
     {
         hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__);
@@ -13750,8 +13797,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return ret;
     }
     pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -13781,6 +13826,8 @@
     sme_SetFTIEs( WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId,
                   (const u8 *)ftie->ie,
                   ftie->ie_len);
+
+    EXIT();
     return 0;
 }
 
@@ -13888,6 +13935,8 @@
     hdd_adapter_t *pAdapter = callbackContext;
     hdd_context_t *pHddCtx;
 
+    ENTER();
+
     if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -13898,8 +13947,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  FL("HDD context is not valid"));
         return;
     }
 
@@ -13912,6 +13959,7 @@
 
     pAdapter->pno_req_status = (status == VOS_STATUS_SUCCESS) ? 0 : -EBUSY;
     complete(&pAdapter->pno_comp_var);
+    EXIT();
 }
 
 /*
@@ -13934,6 +13982,8 @@
     hdd_config_t *pConfig = NULL;
     v_U32_t num_ignore_dfs_ch = 0;
 
+    ENTER();
+
     if (NULL == pAdapter)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -13946,8 +13996,6 @@
 
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return -EINVAL;
     }
 
@@ -14245,6 +14293,8 @@
         vos_mem_free(pnoRequest.p24GProbeTemplate);
     if (pnoRequest.p5GProbeTemplate)
         vos_mem_free(pnoRequest.p5GProbeTemplate);
+
+    EXIT();
     return ret;
 }
 
@@ -14821,6 +14871,8 @@
     int status;
     hddTdlsPeer_t *pTdlsPeer;
 
+    ENTER();
+
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                      TRACE_CODE_HDD_CFG80211_TDLS_OPER,
                      pAdapter->sessionId, oper));
@@ -14832,11 +14884,8 @@
     }
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -15147,6 +15196,8 @@
                 "%s: unsupported event",__func__);
             return -ENOTSUPP;
     }
+
+    EXIT();
     return 0;
 }
 
@@ -15257,7 +15308,6 @@
 
     ENTER();
 
-
     if (NULL == pAdapter)
     {
         VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -15270,11 +15320,8 @@
                      pAdapter->sessionId, pAdapter->device_mode));
 
     result = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != result)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return result;
     }
 
@@ -15345,6 +15392,7 @@
     vos_mem_zero(&hddGtkOffloadReqParams,
                   sizeof(hddGtkOffloadReqParams));
 
+    EXIT();
     return eHAL_STATUS_SUCCESS;
 }
 
@@ -15394,11 +15442,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -15491,6 +15536,7 @@
         return -EINVAL;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -15586,11 +15632,12 @@
 #ifdef FEATURE_WLAN_LPHB
     hdd_context_t *pHddCtx = wiphy_priv(wiphy);
     eHalStatus smeStatus;
+
+    ENTER();
+
     err = wlan_hdd_validate_context(pHddCtx);
     if (0 != err)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return err;
     }
 #endif /* FEATURE_WLAN_LPHB */
@@ -15663,7 +15710,8 @@
             return -EOPNOTSUPP;
     }
 
-   return err;
+    EXIT();
+    return err;
 }
 
 static int wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, void *data, int len)
@@ -15708,11 +15756,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -15779,6 +15824,7 @@
         return -ENONET;
      }
 
+     EXIT();
      return 0;
 }
 
@@ -15808,10 +15854,9 @@
     VOS_STATUS status = VOS_STATUS_SUCCESS;
 
     ENTER();
+
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: Hdd Context is invalid", __func__);
         return 0;
     }
 
@@ -15856,6 +15901,7 @@
             VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                     "%s : cfg80211 scan result database updated", __func__);
 
+            EXIT();
             return 0;
 
         }
@@ -15865,6 +15911,7 @@
 
     VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
           "%s: Failed to find Adapter", __func__);
+    EXIT();
     return 0;
 }
 
@@ -15890,11 +15937,10 @@
     int ret = 0;
 
     ENTER();
+
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return ret;
     }
 
diff --git a/CORE/HDD/src/wlan_hdd_debugfs.c b/CORE/HDD/src/wlan_hdd_debugfs.c
index 7b8d044..b53edcc 100644
--- a/CORE/HDD/src/wlan_hdd_debugfs.c
+++ b/CORE/HDD/src/wlan_hdd_debugfs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -45,6 +45,8 @@
     v_U8_t wow_mp = 0;
     v_U8_t wow_pbm = 0;
 
+    ENTER();
+
     pAdapter = (hdd_adapter_t *)file->private_data;
     if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
@@ -56,8 +58,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
         return -EINVAL;
     }
 
@@ -130,7 +130,7 @@
 
       return -EFAULT;
     }
-
+    EXIT();
     return count;
 }
 
@@ -158,6 +158,8 @@
     char *pattern_buf;
     char *pattern_mask;
 
+    ENTER();
+
     pAdapter = (hdd_adapter_t *)file->private_data;
     if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
@@ -170,8 +172,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return -EINVAL;
     }
     if (!sme_IsFeatureSupportedByFW(WOW))
@@ -236,7 +236,7 @@
 
     hdd_add_wowl_ptrn_debugfs(pAdapter, pattern_idx, pattern_offset,
                               pattern_buf, pattern_mask);
-
+    EXIT();
     return count;
 }
 
@@ -266,6 +266,8 @@
     v_U16_t pattern_len = 0;
     v_U16_t i = 0;
 
+    ENTER();
+
     pAdapter = (hdd_adapter_t *)file->private_data;
     if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
@@ -278,8 +280,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return -EINVAL;
     }
 
@@ -455,6 +455,7 @@
 
     vos_mem_free(addPeriodicTxPtrnParams);
     vos_mem_free(cmd);
+    EXIT();
     return count;
 
 failure:
@@ -480,6 +481,8 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
 
+    ENTER();
+
     pAdapter = (hdd_adapter_t *)file->private_data;
     if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
     {
@@ -491,8 +494,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return -EINVAL;
     }
 
@@ -500,7 +501,7 @@
     {
         file->private_data = inode->i_private;
     }
-
+    EXIT();
     return 0;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c
index 616c526..2bdc83a 100644
--- a/CORE/HDD/src/wlan_hdd_dev_pwr.c
+++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -327,16 +327,14 @@
    int ret = 0;
    hdd_context_t* pHddCtx = NULL;
 
-   pHddCtx =  (hdd_context_t*)wcnss_wlan_get_drvdata(dev);
+   ENTER();
 
-   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: WLAN suspended by platform driver",__func__);
+   pHddCtx =  (hdd_context_t*)wcnss_wlan_get_drvdata(dev);
 
    /* Get the HDD context */
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    if(pHddCtx->isWlanSuspended == TRUE)
@@ -360,6 +358,8 @@
       suspend_notify_sent = true;
    }
 #endif
+
+   EXIT();
    return 0;
 }
 
@@ -389,14 +389,12 @@
    hdd_context_t* pHddCtx = NULL;
    int ret = 0;
 
-   VOS_TRACE(VOS_MODULE_ID_HDD,VOS_TRACE_LEVEL_INFO, "%s: WLAN being resumed by Android OS",__func__);
+   ENTER();
 
    pHddCtx =  (hdd_context_t*)wcnss_wlan_get_drvdata(dev);
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid ",__func__);
        return ret;
    }
    if(pHddCtx->isWlanSuspended != TRUE)
@@ -414,7 +412,7 @@
       suspend_notify_sent = false;
    }
 #endif
-
+   EXIT();
    return 0;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index a96df9b..bbde004 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -459,7 +459,7 @@
     hdd_context_t *pHddCtx;
     int status;
 
-    hddLog(LOG1, FL("Reconfiguring NS Offload"));
+    ENTER();
     if (NULL == pAdapter)
     {
         hddLog(LOGE, FL("Adapter is invalid"));
@@ -470,7 +470,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(LOGE, FL("HDD context is invalid, status = %d"), status);
         return;
     }
 
@@ -503,8 +502,7 @@
      */
     wlan_hdd_set_mc_addr_list(pAdapter, TRUE);
 #endif
-
-
+    EXIT();
 }
 
 void hdd_ipv6_notifier_work_queue(struct work_struct *work)
@@ -523,11 +521,11 @@
     VOS_STATUS vos_status;
     int status;
 
+    ENTER();
     pHddCtx = container_of(nb, hdd_context_t, ipv6_notifier);
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(LOGE, FL("HDD context is invalid"));
         return NOTIFY_DONE;
     }
 
@@ -553,7 +551,7 @@
         vos_status = hdd_get_next_adapter(pHddCtx, pAdapterNode, &pNext);
         pAdapterNode = pNext;
     }
-
+    EXIT();
     return NOTIFY_DONE;
 }
 
@@ -716,11 +714,8 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
     ret = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   FL("HDD context is not valid"));
         return;
     }
 
@@ -937,6 +932,7 @@
     {
        vos_mem_free(selfIPv6AddrValid);
     }
+    EXIT();
     return;
 }
 #endif
@@ -948,7 +944,7 @@
     hdd_context_t *pHddCtx;
     int status;
 
-    hddLog(LOG1, FL("Reconfiguring ARP Offload"));
+    ENTER();
     if (NULL == pAdapter)
     {
         hddLog(LOGE, FL("Adapter is invalid"));
@@ -958,7 +954,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(LOGE, FL("HDD context is invalid, status = %d"), status);
         return;
     }
 
@@ -980,6 +975,7 @@
         // of IPv4 notifier again.
         hdd_conf_arp_offload(pAdapter, 2);
     }
+    EXIT();
 }
 
 void hdd_ipv4_notifier_work_queue(struct work_struct *work)
@@ -1002,11 +998,11 @@
     VOS_STATUS vos_status;
     int status;
 
+    ENTER();
     pHddCtx = container_of(nb, hdd_context_t, ipv4_notifier);
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(LOGE, FL("HDD context is invalid"));
         return NOTIFY_DONE;
     }
 
@@ -1049,7 +1045,7 @@
         vos_status = hdd_get_next_adapter(pHddCtx, pAdapterNode, &pNext);
         pAdapterNode = pNext;
     }
-
+    EXIT();
     return NOTIFY_DONE;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index 6af3937..4736999 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -4871,6 +4871,8 @@
     hdd_context_t *pHddCtx;
     struct iw_point s_priv_data;
 
+    ENTER();
+
     ret =0;
     /* helper function to get iwreq_data with compat handling. */
     if (hdd_priv_get_data(&s_priv_data, wrqu))
@@ -4895,8 +4897,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     sub_cmd = s_priv_data.flags;
@@ -4967,6 +4967,7 @@
 
 OUT:
     kfree(param);
+    EXIT();
     return ret;
 }
 
@@ -4993,6 +4994,8 @@
     int ret = 0; /* success */
     VOS_STATUS status;
 
+    ENTER();
+
     pAdapter = (netdev_priv(dev));
     if (NULL == pAdapter)
     {
@@ -5003,7 +5006,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR, "%s: HDD context is not valid",__func__);
         return ret;
     }
     switch(sub_cmd)
@@ -5169,6 +5171,7 @@
         }
     }
 
+    EXIT();
     return ret;
 }
 
@@ -5193,6 +5196,8 @@
     int ret = 0; /* success */
     VOS_STATUS status;
 
+    ENTER();
+
     pAdapter = (netdev_priv(dev));
     if (NULL == pAdapter)
     {
@@ -5203,7 +5208,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR, "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -5249,6 +5253,7 @@
         }
     }
 
+    EXIT();
     return ret;
 }
 
@@ -5273,6 +5278,8 @@
     hdd_context_t *pHddCtx;
     int ret = 0;
 
+    ENTER();
+
     pAdapter = (netdev_priv(dev));
     if (NULL == pAdapter)
     {
@@ -5283,7 +5290,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR, "%s: HDD context is not valid ",__func__);
         return ret;
     }
     switch(sub_cmd)
@@ -5346,6 +5352,7 @@
         }
     }
 
+    EXIT();
     return 0;
 }
 
@@ -5483,6 +5490,8 @@
     int *value = (int*)wrqu->data.pointer;
     int ret = 0;
 
+    ENTER();
+
     if(wrqu->data.length != 2)
     {
         hddLog(LOGE, "Invalid number of Arguments  %d  \n",  wrqu->data.length);
@@ -5499,8 +5508,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     switch (sub_cmd)
@@ -5531,6 +5538,7 @@
         }
     }
 
+    EXIT();
     return 0;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 8c28386..32f2a67 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -323,6 +323,8 @@
     * Note that valid pointers are provided by caller
     */
 
+   ENTER();
+
    if (priv_data->total_len <= 0 ||
        priv_data->total_len > HOSTAPD_IOCTL_COMMAND_STRLEN_MAX)
    {
@@ -335,11 +337,8 @@
       goto exit;
    }
    status = wlan_hdd_validate_context(pHddCtx);
-
    if (0 != status)
    {
-       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid", __func__);
        return status;
    }
 
@@ -439,6 +438,7 @@
    {
       kfree(command);
    }
+   EXIT();
    return ret;
 }
 
@@ -503,6 +503,8 @@
    hdd_context_t *pHddCtx;
    int ret;
 
+   ENTER();
+
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter) {
       hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -543,6 +545,7 @@
       break;
    }
  exit:
+   EXIT();
    return ret;
 }
 
@@ -576,6 +579,7 @@
    hdd_adapter_t *pAdapter;
    hdd_context_t *pHddCtx;
    int ret = 0;
+
    ENTER();
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
@@ -588,8 +592,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    memcpy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN);
@@ -730,13 +732,13 @@
     hdd_context_t     *pHddCtx = NULL;
     VOS_STATUS status = VOS_STATUS_SUCCESS;
     dev = (struct net_device *)usrDataForCallback;
+
     ENTER();
 
     pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
 
     if (0 != status) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
         return status;
     }
 
@@ -1763,6 +1765,8 @@
     int ret = 0; /* success */
     v_CONTEXT_t pVosContext;
 
+    ENTER();
+
     if (NULL == pHostapdAdapter)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1775,8 +1779,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               "%s: HDD context is not valid",__func__);
         return -1;
     }
 
@@ -1911,6 +1913,7 @@
             break;
     }
 
+    EXIT();
     return ret;
 }
 
@@ -1942,6 +1945,8 @@
     int ret = 0; /* success */
     v_CONTEXT_t pVosContext;
 
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -1953,8 +1958,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
@@ -2044,6 +2047,7 @@
 
     }
 
+    EXIT();
     return ret;
 }
 
@@ -2104,8 +2108,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pVosContext =  pHddCtx->pvosContext;
@@ -2158,6 +2160,9 @@
     hdd_context_t *pHddCtx;
     int ret = 0;
     int *value;
+
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2169,14 +2174,14 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
     *value = *(int *)extra;
 
     *value = (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->operatingChannel;
+
+    EXIT();
     return 0;
 }
 
@@ -2208,6 +2213,8 @@
     tSirMacAddr bssid = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
     tSirMacAddr selfMac = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2219,8 +2226,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
@@ -2247,6 +2252,7 @@
         return -EIO;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -2279,7 +2285,9 @@
     hdd_adapter_t *pHostapdAdapter;
     hdd_context_t *pHddCtx;
     int ret = 0;
-    hddLog(LOGE, "%s: called for SAP",__func__);
+
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2291,12 +2299,12 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     hdd_wmm_tx_snapshot(pHostapdAdapter);
     WLANTL_TLDebugMessage(WLANTL_DEBUG_TX_SNAPSHOT);
+
+    EXIT();
     return 0;
 }
 
@@ -2327,6 +2335,8 @@
     int set_value, ret = 0;
     ptSapContext  pSapCtx = NULL;
 
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2338,8 +2348,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pVosContext = pHddCtx->pvosContext;
@@ -2375,6 +2383,7 @@
         return -EIO;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -2413,6 +2422,8 @@
     hdd_context_t *pHddCtx;
     int status;
 
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -2424,11 +2435,8 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -2462,6 +2470,8 @@
         }
 
     }
+
+    EXIT();
     return 0;
 }
 
@@ -2497,6 +2507,8 @@
     v_CONTEXT_t pVosContext = NULL;
     ptSapContext pSapCtx = NULL;
 
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2508,8 +2520,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -2572,6 +2582,8 @@
         ret = -EFAULT;
     }
     kfree(buf);
+
+    EXIT();
     return ret;
 }
 
@@ -2624,8 +2636,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     /* iwpriv tool or framework calls this ioctl with
@@ -2665,6 +2675,8 @@
     char *pstatbuf;
     int len, ret = 0;
 
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2676,8 +2688,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     memset(&statBuffer, 0, sizeof(statBuffer));
@@ -2711,6 +2721,8 @@
     strlcpy(extra, pstatbuf, len);
     wrqu->data.length = len;
     kfree(pstatbuf);
+
+    EXIT();
     return 0;
 }
 
@@ -2742,6 +2754,8 @@
     VOS_STATUS status;
     int ret = 0; /* success */
 
+    ENTER();
+
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
     {
@@ -2753,8 +2767,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
@@ -2774,6 +2786,7 @@
 
     pHddCtx->is_dynamic_channel_range_set = 1;
 
+    EXIT();
     return ret;
 }
 
@@ -2807,6 +2820,9 @@
     eCsrBand curBand = eCSR_BAND_ALL;
     hdd_context_t *pHddCtx;
     int ret = 0;
+
+    ENTER();
+
     pHostapdAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pHostapdAdapter)
     {
@@ -2818,8 +2834,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
@@ -2928,6 +2942,7 @@
     v_U32_t length = DOT11F_IE_RSN_MAX_LEN;
     v_U8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN];
     int ret = 0;
+
     ENTER();
 
     pHostapdAdapter = (netdev_priv(dev));
@@ -2941,8 +2956,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pVosContext = pHddCtx->pvosContext;
@@ -2998,6 +3011,7 @@
     hdd_ap_ctx_t *pHddApCtx;
     hdd_context_t *pHddCtx;
     int ret = 0;
+
     ENTER();
 
     pHostapdAdapter = (netdev_priv(dev));
@@ -3011,8 +3025,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter);
@@ -3082,6 +3094,7 @@
    hdd_context_t *pHddCtx;
    hdd_wext_state_t *pWextState;
    int ret = 0;
+
    ENTER();
 
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -3096,8 +3109,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -3168,6 +3179,7 @@
     tCsrRoamSetKey  setKey;
 //    tCsrRoamRemoveKey RemoveKey;
     int i;
+
     ENTER();
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
@@ -3181,8 +3193,6 @@
     retval = wlan_hdd_validate_context(pHddCtx);
     if (0 != retval)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return retval;
     }
     pVosContext = pHddCtx->pvosContext;
@@ -3355,8 +3365,9 @@
                    "[%4d] WLANSAP_SetKeySta returned ERROR status= %d", __LINE__, vstatus );
        retval = -EINVAL;
     }
-   
-   return retval;
+
+    EXIT();
+    return retval;
 }
 
 static int iw_set_ap_encodeext(struct net_device *dev,
@@ -3509,8 +3520,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
@@ -3569,7 +3578,9 @@
            fwrq->e = MHZ;
        }
     }
-   return 0;
+
+    EXIT();
+    return 0;
 }
 
 static int iw_get_ap_freq(struct net_device *dev,
@@ -3593,6 +3604,8 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
 
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -3604,13 +3617,12 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return status;
     }
 
     wrqu->mode = IW_MODE_MASTER;
 
+    EXIT();
     return status;
 }
 
@@ -3645,6 +3657,7 @@
    u_int16_t length;
    struct iw_point s_priv_data;
    int ret = 0;
+
    ENTER();
 
    pHostapdAdapter = (netdev_priv(dev));
@@ -3658,8 +3671,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    pVosContext = pHddCtx->pvosContext;
@@ -4019,7 +4030,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status) {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
         return status;
     }
 
@@ -4067,6 +4077,7 @@
     hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev));
     hdd_context_t *pHddCtx;
     int ret = 0;
+
     ENTER();
     pHostapdAdapter = (netdev_priv(dev));
     if (NULL == pHostapdAdapter)
@@ -4079,8 +4090,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     hdd_wlan_get_version(pHostapdAdapter, wrqu, extra);
@@ -4111,6 +4120,8 @@
     hdd_context_t *pHddCtx;
     ptSapContext pSapCtx = NULL;
 
+    ENTER();
+
     if (NULL == pAdapter)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -4120,8 +4131,6 @@
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     if (0 != wlan_hdd_validate_context(pHddCtx))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid ",__func__);
         return VOS_STATUS_E_FAULT;
     }
     pVosContext = pHddCtx->pvosContext;
@@ -4163,6 +4172,7 @@
             break;
         }
     }
+    EXIT();
     return VOS_STATUS_SUCCESS;
 }
 
@@ -4222,8 +4232,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pVosContext = pHddCtx->pvosContext;
@@ -4350,6 +4358,8 @@
    VOS_STATUS status = VOS_STATUS_E_FAILURE;
    int rc, valid;
 
+   ENTER();
+
    pHostapdAdapter = (netdev_priv(dev));
    if (NULL == pHostapdAdapter)
    {
@@ -4361,7 +4371,6 @@
    valid = wlan_hdd_validate_context(pHddCtx);
    if (0 != valid)
    {
-       hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context not valid"));
        return valid;
    }
 
@@ -4445,6 +4454,7 @@
       return -EIO;
    }
 
+   EXIT();
    return 0;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9afc876..bb026b6 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1683,12 +1683,12 @@
     int ret = 0;
     hdd_context_t *pHddCtx;
 
+    ENTER();
+
     pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     ret = wlan_hdd_validate_context(pHddCtx);
     if (ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid!", __func__);
         goto exit;
     }
 
@@ -1911,7 +1911,7 @@
     }
 
 exit:
-
+    EXIT();
     return ret;
 }
 
@@ -2187,6 +2187,8 @@
    hdd_scaninfo_t *pScanInfo = NULL;
    int ret = 0;
    int status;
+
+   ENTER();
    /*
     * Note that valid pointers are provided by caller
     */
@@ -2206,9 +2208,8 @@
    status = wlan_hdd_validate_context(pHddCtx);
    if (0 != status)
    {
-       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid", __func__);
-       return status;
+       ret = -EINVAL;
+       goto exit;
    }
    /* Allocate +1 for '\0' */
    command = kmalloc(priv_data.total_len + 1, GFP_KERNEL);
@@ -4338,6 +4339,7 @@
        }
    }
 exit:
+   EXIT();
    if (command)
    {
        kfree(command);
@@ -4403,6 +4405,8 @@
    hdd_context_t *pHddCtx;
    int ret;
 
+   ENTER();
+
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter) {
       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -4443,6 +4447,7 @@
       break;
    }
  exit:
+   EXIT();
    return ret;
 }
 
@@ -5435,8 +5440,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (ret)
    {
-      VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                "%s: HDD context is not valid!", __func__);
       return ret;
    }
 
@@ -5908,8 +5911,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -7916,6 +7917,8 @@
    int i = 0, ret = 0;
    struct netdev_hw_addr *ha;
 
+   ENTER();
+
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
    {
@@ -7927,8 +7930,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-      hddLog(VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return;
    }
    if (dev->flags & IFF_ALLMULTI)
@@ -7963,6 +7964,8 @@
          i++;
       }
    }
+
+   EXIT();
    return;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index 3265e46..bf1b9f3 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -124,6 +124,7 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
 
+    ENTER();
     pAdapter = (netdev_priv(dev));
     if (NULL == pAdapter)
     {
@@ -135,8 +136,6 @@
     rc = wlan_hdd_validate_context(pHddCtx);
     if (0 != rc)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return rc;
     }
     do
@@ -165,6 +164,7 @@
         }
     } while(0);
 
+    EXIT();
     return rc;
 }
 
@@ -214,6 +214,7 @@
     hdd_context_t *pHddCtx;
     hdd_wext_state_t *pwextBuf;
 
+    ENTER();
     pAdapter = (netdev_priv(dev));
     if (NULL == pAdapter)
     {
@@ -225,8 +226,6 @@
     rc = wlan_hdd_validate_context(pHddCtx);
     if (0 != rc)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return rc;
     }
 
@@ -282,6 +281,7 @@
 
     } while(0);
 
+    EXIT();
     return rc;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 434a9c4..d4e844d 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -458,6 +458,7 @@
     rem_on_channel_request_type_t request_type;
     int ret = 0;
 
+    ENTER();
     if (NULL == pAdapter)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -468,8 +469,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid, ret = %d",__func__, ret);
         return ret;
     }
     cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
@@ -575,6 +574,7 @@
     }
 
     pAdapter->is_roc_inprogress = TRUE;
+    EXIT();
     return 0;
 }
 
@@ -596,6 +596,7 @@
     hdd_adapter_t *pStaAdapter;
     int status = 0;
 
+    ENTER();
     if (NULL == pAdapter)
     {
         VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -605,11 +606,8 @@
 
     pHddCtx = WLAN_HDD_GET_CTX( pAdapter );
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -697,7 +695,10 @@
         }
     }
 
-    return wlan_hdd_p2p_start_remain_on_channel(pAdapter);
+    status = wlan_hdd_p2p_start_remain_on_channel(pAdapter);
+
+    EXIT();
+    return status;
 }
 
 int __wlan_hdd_cfg80211_remain_on_channel( struct wiphy *wiphy,
@@ -719,6 +720,7 @@
     hdd_context_t *pHddCtx;
     int ret = 0;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -730,21 +732,21 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                      TRACE_CODE_HDD_REMAIN_ON_CHANNEL,
                      pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST));
-    return wlan_hdd_request_remain_on_channel(wiphy, dev,
+    ret = wlan_hdd_request_remain_on_channel(wiphy, dev,
                                         chan,
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
                                         channel_type,
 #endif
                                         duration, cookie,
                                         REMAIN_ON_CHANNEL_REQUEST);
+    EXIT();
+    return ret;
 }
 
 int wlan_hdd_cfg80211_remain_on_channel( struct wiphy *wiphy,
@@ -892,6 +894,8 @@
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX( pAdapter );
     int status;
     u64 cookie_dummy;
+
+    ENTER();
     cookie_dummy = cookie << 32;
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                      TRACE_CODE_HDD_CFG80211_CANCEL_REMAIN_ON_CHANNEL,
@@ -902,8 +906,6 @@
 
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
     hddLog( LOG1, "Cancel remain on channel req (cookie = %llu)", cookie);
@@ -1005,6 +1007,8 @@
               "%s:wait on cancel_rem_on_chan_var failed %d", __func__, status);
     }
     hdd_allow_suspend();
+
+    EXIT();
     return 0;
 }
 
@@ -1080,15 +1084,14 @@
     hdd_adapter_t *goAdapter;
 #endif
 
-     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
+    ENTER();
+    MTRACE(vos_trace(VOS_MODULE_ID_HDD,
                       TRACE_CODE_HDD_ACTION, pAdapter->sessionId,
                       pAdapter->device_mode ));
     status = wlan_hdd_validate_context(pHddCtx);
 
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -1432,6 +1435,7 @@
                             pAdapter->dev,
 #endif
                             *cookie, buf, len, FALSE, GFP_KERNEL );
+    EXIT();
     return 0;
 }
 
@@ -1900,13 +1904,12 @@
     hdd_adapter_t *pAdapter = NULL;
     hdd_scaninfo_t *pScanInfo = NULL;
     int ret = 0;
+
     ENTER();
 
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
        return ERR_PTR(-EINVAL);
 #else
@@ -2035,6 +2038,7 @@
     hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
     hdd_adapter_t *pVirtAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     int status;
+
     ENTER();
 
     MTRACE(vos_trace(VOS_MODULE_ID_HDD,
@@ -2047,8 +2051,6 @@
 
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index b515570..7c79abe 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -697,8 +697,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -840,8 +838,6 @@
        vos_mem_free(scanRequest.SSIDs.SSIDList);
 
    EXIT();
-
-   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: exit !!!",__func__);
    return status;
 }
 
@@ -885,9 +881,9 @@
    tScanResultHandle pResult;
    int i = 0, ret = 0;
 
+   ENTER();
    VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: enter buffer length %d!!!",
        __func__, (wrqu->data.length)?wrqu->data.length:IW_SCAN_MAX_DATA);
-   ENTER();
 
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
@@ -901,8 +897,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -955,8 +949,8 @@
 
    sme_ScanResultPurge(hHal, pResult);
 
-   EXIT();
    VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: exit total %d BSS reported !!!",__func__, i);
+   EXIT();
    return status;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 56e8c2b..062842d 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -145,12 +145,10 @@
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     VOS_STATUS status = VOS_STATUS_SUCCESS;
 
+    ENTER();
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (0 != status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -177,6 +175,8 @@
         VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_INFO,
                   "%s  Traffic Monitor is not Enable in ini file", __func__);
     }
+
+    EXIT();
     return status;
 }
 
@@ -185,12 +185,10 @@
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
     VOS_STATUS status = VOS_STATUS_SUCCESS;
 
+    ENTER();
     status = wlan_hdd_validate_context(pHddCtx);
-
     if (-ENODEV == status)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                   "%s: HDD context is not valid", __func__);
         return status;
     }
 
@@ -209,6 +207,7 @@
         vos_lock_destroy(&pHddCtx->traffic_monitor.trafficLock);
         pHddCtx->traffic_monitor.isInitialized = 0;
     }
+    EXIT();
     return VOS_STATUS_SUCCESS;
 }
 
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 2fbfa89..03fef0c 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -92,6 +92,8 @@
     hdd_station_ctx_t *pHddStaCtx;
     hdd_context_t *pHddCtx;
 
+    ENTER();
+
     if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter) )
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -103,8 +105,6 @@
 
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -125,6 +125,7 @@
     if ( mutexLock )
         mutex_unlock(&pHddCtx->tdls_lock);
 
+    EXIT();
     return;
 }
 
@@ -143,6 +144,8 @@
     tANI_BOOLEAN doMutexLock = eANI_BOOLEAN_TRUE;
     v_CONTEXT_t pVosContext;
 
+    ENTER();
+
     pVosContext = vos_get_global_context(VOS_MODULE_ID_HDD, NULL);
     if (NULL == pVosContext)
     {
@@ -154,8 +157,6 @@
     pHddCtx = vos_get_context(VOS_MODULE_ID_HDD, pVosContext);
     if (0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -258,6 +259,7 @@
 
     if ( !doMutexLock )
         mutex_unlock(&pHddCtx->tdls_lock);
+    EXIT();
     return;
 }
 #endif
@@ -272,6 +274,7 @@
     hdd_context_t *pHddCtx;
     v_CONTEXT_t pVosContext;
 
+    ENTER();
     pVosContext = vos_get_global_context(VOS_MODULE_ID_HDD, NULL);
     if (NULL == pVosContext)
     {
@@ -282,8 +285,6 @@
     pHddCtx = vos_get_context(VOS_MODULE_ID_HDD, pVosContext);
     if (0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
     mutex_lock(&pHddCtx->tdls_lock);
@@ -445,6 +446,7 @@
                                 &pHddTdlsCtx->peerUpdateTimer,
                                 pHddTdlsCtx->threshold_config.tx_period_t);
     mutex_unlock(&pHddCtx->tdls_lock);
+    EXIT();
 }
 
 static v_VOID_t wlan_hdd_tdls_idle_cb( v_PVOID_t userData )
@@ -455,6 +457,8 @@
     hdd_context_t *pHddCtx;
     v_CONTEXT_t pVosContext;
 
+    ENTER();
+
     pVosContext = vos_get_global_context(VOS_MODULE_ID_HDD, NULL);
     if (NULL == pVosContext)
     {
@@ -465,8 +469,6 @@
     pHddCtx = vos_get_context(VOS_MODULE_ID_HDD, pVosContext);
     if (0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -519,6 +521,7 @@
                                       eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON);
     }
     mutex_unlock(&pHddCtx->tdls_lock);
+    EXIT();
 #endif
 }
 
@@ -532,6 +535,7 @@
     hdd_context_t *pHddCtx;
     v_CONTEXT_t pVosContext;
 
+    ENTER();
     pVosContext = vos_get_global_context(VOS_MODULE_ID_HDD, NULL);
     if (NULL == pVosContext)
     {
@@ -543,8 +547,6 @@
     pHddCtx = vos_get_context(VOS_MODULE_ID_HDD, pVosContext);
     if (0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -582,7 +584,7 @@
     mutex_unlock(&pHddCtx->tdls_lock);
 
     wlan_hdd_tdls_check_bmps(pHddTdlsCtx->pAdapter);
-
+    EXIT();
     return;
 }
 
@@ -669,6 +671,7 @@
     hddTdlsPeer_t *currPeer;
     hdd_scaninfo_t *pScanInfo;
 
+    ENTER();
     if ((NULL == data) || (indType < 0))
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -679,8 +682,6 @@
     pHddCtx     = (hdd_context_t *)data;
     if (0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  FL("pHddCtx is not valid"));
         return;
     }
 
@@ -787,6 +788,7 @@
             wlan_hdd_tdls_set_mode(pHddCtx, pHddCtx->tdls_mode_last, FALSE);
         }
    }
+   EXIT();
    return;
 }
 
@@ -1076,10 +1078,9 @@
     tdlsCtx_t *pHddTdlsCtx;
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
 
@@ -1130,6 +1131,7 @@
     list_add_tail(&peer->node, head);
     mutex_unlock(&pHddCtx->tdls_lock);
 
+    EXIT();
     return peer;
 }
 
@@ -1236,6 +1238,8 @@
     tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
     hdd_context_t *pHddCtx;
 
+    ENTER();
+
     if ( NULL == pHddTdlsCtx )
     {
        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1247,8 +1251,6 @@
 
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
 
@@ -1318,6 +1320,7 @@
     }
 
     curr_peer->tdls_support = eTDLS_CAP_SUPPORTED;
+    EXIT();
     return 0;
 }
 
@@ -1673,10 +1676,9 @@
     tdlsCtx_t *pHddTdlsCtx;
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
 
@@ -1708,6 +1710,8 @@
     }
     if ( mutexLock )
         mutex_unlock(&pHddCtx->tdls_lock);
+
+    EXIT();
     return NULL;
 }
 
@@ -1850,13 +1854,12 @@
 {
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
-
+    EXIT();
     return pHddCtx->connected_peer_count;
 }
 
@@ -1869,10 +1872,9 @@
     tdlsCtx_t *pHddTdlsCtx;
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return NULL;
     }
 
@@ -1898,6 +1900,8 @@
         }
     }
     mutex_unlock(&pHddCtx->tdls_lock);
+
+    EXIT();
     return NULL;
 }
 
@@ -1911,10 +1915,9 @@
     tdlsCtx_t *pHddTdlsCtx;
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
 
@@ -1955,6 +1958,8 @@
         }
     }
     mutex_unlock(&pHddCtx->tdls_lock);
+
+    EXIT();
     return init_len-buflen;
 }
 
@@ -2058,10 +2063,9 @@
 {
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -2074,16 +2078,17 @@
                __func__, pHddCtx->connected_peer_count);
 
     mutex_unlock(&pHddCtx->tdls_lock);
+
+    EXIT();
 }
 
 void wlan_hdd_tdls_decrement_peer_count(hdd_adapter_t *pAdapter)
 {
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -2098,6 +2103,7 @@
 
     mutex_unlock(&pHddCtx->tdls_lock);
 
+    EXIT();
 }
 
 void wlan_hdd_tdls_check_bmps(hdd_adapter_t *pAdapter)
@@ -2267,12 +2273,11 @@
     hdd_adapter_t *pAdapter;
     tdlsCtx_t *pHddTdlsCtx;
 
+    ENTER();
     VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,"%s mode %d", __func__, (int)tdls_mode);
 
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -2313,6 +2318,8 @@
     pHddCtx->tdls_mode = tdls_mode;
 
     mutex_unlock(&pHddCtx->tdls_lock);
+
+    EXIT();
 }
 
 static void __wlan_hdd_tdls_pre_setup(struct work_struct *work)
@@ -2324,6 +2331,7 @@
     hddTdlsPeer_t *temp_peer;
     int status;
 
+    ENTER();
     if (NULL == pHddTdlsCtx)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -2342,8 +2350,6 @@
 
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -2409,6 +2415,7 @@
 done:
     pHddTdlsCtx->curr_candidate = NULL;
     pHddTdlsCtx->magic = 0;
+    EXIT();
     return;
 }
 
@@ -2493,10 +2500,9 @@
 {
     tdls_scan_context_t *scan_ctx;
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
 
@@ -2508,6 +2514,8 @@
 #endif
 
     scan_ctx->scan_request = request;
+
+    EXIT();
     return 0;
 }
 
@@ -2549,10 +2557,9 @@
     unsigned long delay;
     hdd_config_t  *cfg_param = pHddCtx->cfg_ini;
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return 0;
     }
 
@@ -2730,6 +2737,7 @@
                 "%s: tdls_mode %d, and no tdls connection. scan allowed",
                  __func__, pHddCtx->tdls_mode);
     }
+    EXIT();
     return 1;
 }
 
@@ -2737,10 +2745,9 @@
 {
     hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
+    ENTER();
     if(0 != (wlan_hdd_validate_context(pHddCtx)))
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 FL("pHddCtx is not valid"));
         return;
     }
 
@@ -2762,6 +2769,8 @@
         wlan_hdd_tdls_set_mode(pHddCtx, pHddCtx->tdls_mode_last, FALSE);
     }
     wlan_hdd_tdls_check_bmps(pAdapter);
+
+    EXIT();
 }
 
 void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter,
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index 5164879..92e7b4a 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -382,6 +382,7 @@
    hdd_context_t *pHddCtx;
    int ret = 0;
 
+   ENTER();
    if (pAdapter == NULL)
    {
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_ERROR,
@@ -393,8 +394,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid, ret =%d",__func__, ret);
        return;
    }
    pMonAdapter = hdd_get_adapter( pAdapter->pHddCtx, WLAN_HDD_MONITOR );
@@ -471,9 +470,11 @@
           "%s: WLANSAP_SendAction returned fail", __func__);
       hdd_sendActionCnf( pAdapter, FALSE );
    }
+   EXIT();
    return;
 
 mgmt_handled:
+   EXIT();
    hdd_sendActionCnf( pAdapter, TRUE );
    return;
 fail:
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 3fa2afa..e6cb53b 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -355,13 +355,6 @@
 #define WLAN_ADAPTER 0
 #define P2P_ADAPTER  1
 
-#define HDD_IOCTL_RATELIMIT_INTERVAL 20*HZ
-#define HDD_IOCTL_RATELIMIT_BURST 1
-
-static DEFINE_RATELIMIT_STATE(hdd_ioctl_timeout_rs, \
-        HDD_IOCTL_RATELIMIT_INTERVAL,     \
-        HDD_IOCTL_RATELIMIT_BURST);
-
 /*
  * When supplicant sends SETBAND ioctl it queries for channels from
  * cfg80211 layer by sending itself EVENT_CHANNEL_LIST_CHANGED command.
@@ -553,8 +546,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -602,8 +593,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return status;
     }
 
@@ -910,6 +899,8 @@
    long lrc;
    int valid;
 
+   ENTER();
+
    if (NULL == pAdapter)
    {
        hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -922,7 +913,6 @@
    valid = wlan_hdd_validate_context(pHddCtx);
    if (0 != valid)
    {
-       hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
        return VOS_STATUS_E_FAULT;
    }
 
@@ -977,6 +967,7 @@
 
    *snr = pAdapter->snr;
 
+   EXIT();
    return VOS_STATUS_SUCCESS;
 }
 #if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
@@ -1382,6 +1373,9 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
     int ret = 0;
+
+    ENTER();
+
     pAdapter  = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -1393,12 +1387,12 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is Null", __func__);
         return ret;
     }
-    hddLog( LOG1, "In %s", __func__);
+
     /* Do nothing for now */
+
+    EXIT();
     return ret;
 }
 
@@ -1421,6 +1415,7 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
     int ret = 0;
+
     ENTER();
     pAdapter  = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
@@ -1433,8 +1428,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is Null", __func__);
         return ret;
     }
     strlcpy(wrqu, "Qcom:802.11n", IFNAMSIZ);
@@ -1482,8 +1475,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        hddLog(VOS_TRACE_LEVEL_WARN,
-               "%s: HddCtx is Invalid", __func__);
         return status;
     }
 
@@ -1579,7 +1570,8 @@
     hdd_context_t *pHddCtx;
     int ret = 0;
 
-    hddLog(LOG1, "In %s", __func__);
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -1592,8 +1584,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               "%s: HDD context is not valid",__func__);
         return ret;
     }
     pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -1623,6 +1613,7 @@
         break;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -1655,6 +1646,7 @@
     tHalHandle hHal;
     hdd_station_ctx_t *pHddStaCtx;
     tCsrRoamProfile * pRoamProfile;
+
     ENTER();
 
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -1669,8 +1661,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s:HDD context is NULL",__func__);
        return status;
     }
 
@@ -1814,8 +1804,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HddCtx is NULL", __func__);
        return ret;
    }
    hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -1870,7 +1858,9 @@
        fwrq->m = 0;
        fwrq->e = MHZ;
     }
-   return ret;
+
+    EXIT();
+    return ret;
 }
 
 static int iw_get_freq(struct net_device *dev,
@@ -1896,6 +1886,8 @@
    hdd_station_ctx_t *pHddStaCtx;
    int ret = 0;
 
+   ENTER();
+
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
    {
@@ -1907,8 +1899,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -1928,6 +1918,7 @@
    wlan_hdd_get_classAstats(pAdapter);
    wrqu->txpower.value = pAdapter->hdd_stats.ClassA_stat.max_pwr;
 
+   EXIT();
    return 0;
 }
 
@@ -1966,8 +1957,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -2029,8 +2018,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -2136,8 +2123,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -2208,6 +2193,8 @@
                 FL("failed to set ini parameter, WNI_CFG_FIXED_RATE"));
         return -EIO;
     }
+
+    EXIT();
     return 0;
 }
 
@@ -2252,8 +2239,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -2370,6 +2355,7 @@
         genie += eLen;
         remLen -= eLen;
     }
+
     EXIT();
     kfree(base_genie);
     return 0;
@@ -2404,7 +2390,6 @@
 
     ENTER();
 
-    hddLog(LOG1,"getGEN_IE ioctl");
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -2416,8 +2401,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return status;
     }
 
@@ -2509,8 +2492,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -2644,8 +2625,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -2734,8 +2713,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -2797,10 +2774,10 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
+
+   EXIT();
    return -EOPNOTSUPP;
 }
 
@@ -2836,10 +2813,10 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
+
+    EXIT();
     return -EOPNOTSUPP;
 }
 
@@ -2888,8 +2865,6 @@
    ret =  wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       hddLog(VOS_TRACE_LEVEL_ERROR,
-              "%s: HDD context is not valid",__func__);
        return ret;
    }
    hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -3384,6 +3359,7 @@
    VOS_STATUS status;
    int rc, valid = 0;
 
+   ENTER();
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
    {
@@ -3394,10 +3370,8 @@
 
    pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
    valid = wlan_hdd_validate_context(pHddCtx);
-
    if (0 != valid)
    {
-       hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid %d"), valid);
        return valid;
    }
    pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -3451,6 +3425,7 @@
        return -EIO;
    }
 
+   EXIT();
   /* a value is being successfully returned */
    return rc;
 }
@@ -3990,8 +3965,6 @@
     rc = wlan_hdd_validate_context(pHddCtx);
     if (0 != rc)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR,
-               "%s: HDD context is not valid", __func__);
         return rc;
     }
 
@@ -4313,6 +4286,7 @@
                __func__, cmd, wrqu->data.length, rc);
     }
     kfree(cmd);
+    EXIT();
     return rc;
 }
 
@@ -4335,6 +4309,7 @@
    hdd_adapter_t *pAdapter;
    hdd_context_t *pHddCtx;
    int ret = 0;
+
    ENTER();
 
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
@@ -4349,10 +4324,9 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
+   EXIT();
    return 0;
 }
 
@@ -4391,10 +4365,9 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
+   EXIT();
    return 0;
 }
 
@@ -4460,8 +4433,6 @@
    status = wlan_hdd_validate_context(pHddCtx);
    if (0 != status)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return status;
    }
    pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -4606,7 +4577,7 @@
           return status;
        }
    }
-
+   EXIT();
    return 0;
 }
 
@@ -4650,8 +4621,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -4774,8 +4743,6 @@
     status = wlan_hdd_validate_context(pHddCtx);
     if (0 != status)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return status;
     }
     pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -4959,8 +4926,8 @@
 
        pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE;
     }
-
-   return halStatus;
+    EXIT();
+    return halStatus;
 }
 
 static int iw_set_encodeext(struct net_device *dev,
@@ -4999,8 +4966,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -5091,8 +5056,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
 
@@ -5178,8 +5141,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                                  "%s HDD context is not valid",__func__);
         return ret;
     }
     pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -5275,6 +5236,7 @@
     v_U8_t nEnableSuspendOld;
 #endif
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -5286,7 +5248,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -5730,7 +5691,7 @@
             break;
         }
     }
-
+    EXIT();
     return ret;
 }
 
@@ -5763,6 +5724,7 @@
     struct iw_point s_priv_data;
     tSirpkt80211 *pkt;
 
+    ENTER();
     pAdapter = (netdev_priv(dev));
     if (NULL == pAdapter)
     {
@@ -5775,8 +5737,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 #ifdef WLAN_FEATURE_VOWIFI
@@ -5901,6 +5861,8 @@
        }
     }
     kfree(pBuffer);
+
+    EXIT();
     return ret;
 }
 
@@ -5929,6 +5891,8 @@
     int ret = 0; /* success */
     tSmeConfigParams smeConfig;
 
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -5940,11 +5904,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        if (__ratelimit(&hdd_ioctl_timeout_rs))
-        {
-            VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
-                      "%s:Hdd context is not valid", __func__);
-        }
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -6062,7 +6021,7 @@
             break;
         }
     }
-
+    EXIT();
     return ret;
 }
 
@@ -6090,6 +6049,7 @@
     int sub_cmd = value[0];
     int ret = 0;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -6101,8 +6061,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     switch(sub_cmd)
@@ -6129,6 +6087,7 @@
             break;
         }
     }
+    EXIT();
     return ret;
 }
 
@@ -6157,6 +6116,7 @@
     hdd_wext_state_t *pWextState;
 #endif
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (pAdapter == NULL)
     {
@@ -6168,8 +6128,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 #ifdef WLAN_FEATURE_11W
@@ -6609,7 +6567,6 @@
             status = wlan_hdd_validate_context(pHddCtx);
             if (0 != status)
             {
-                hddLog(LOGE, "%s: getSNR: HDD context is not valid", __func__);
                 return status;
             }
 
@@ -6639,7 +6596,7 @@
             break;
         }
     }
-
+    EXIT();
     return 0;
 }
 
@@ -6667,6 +6624,8 @@
     int ret = 0; /* success */
     struct iw_point s_priv_data;
 
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -6678,8 +6637,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     /* helper function to get iwreq_data with compat handling. */
@@ -6868,7 +6825,7 @@
             break;
         }
     }
-
+    EXIT();
     return ret;
 }
 
@@ -6947,6 +6904,7 @@
     int staId = 0;
     int ret = 0;
 
+    ENTER();
     if (extra == NULL)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -6964,8 +6922,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                    "%s: HDD context is Null", __func__);
         return ret;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -7109,7 +7065,7 @@
             }
             break;
     }
-
+    EXIT();
     return 0;
 }
 
@@ -7183,6 +7139,7 @@
    struct iw_point s_priv_data;
    int ret = 0;
 
+   ENTER();
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
    {
@@ -7194,8 +7151,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -7346,6 +7301,8 @@
    }
 
    *pStatus = hdd_wmm_addts(pAdapter, handle, &tSpec);
+
+   EXIT();
    return 0;
 }
 
@@ -7374,6 +7331,8 @@
    v_U32_t handle;
    int ret = 0;
 
+   ENTER();
+
    pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
    if (NULL == pAdapter)
    {
@@ -7386,8 +7345,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    // make sure the application is sufficiently priviledged
@@ -7412,6 +7369,8 @@
    }
 
    *pStatus = hdd_wmm_delts(pAdapter, handle);
+
+   EXIT();
    return 0;
 }
 
@@ -7440,6 +7399,8 @@
    v_U32_t handle;
    int ret = 0;
 
+   ENTER();
+
    // although we are defined to be a "get" ioctl, the params we require
    // will fit in the iwreq_data, therefore unlike iw_add_tspec() there
    // is no need to copy the params from user space
@@ -7455,8 +7416,6 @@
    ret = wlan_hdd_validate_context(pHddCtx);
    if (0 != ret)
    {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                 "%s: HDD context is not valid",__func__);
        return ret;
    }
    // validate the handle
@@ -7469,6 +7428,7 @@
    }
 
    *pStatus = hdd_wmm_checkts(pAdapter, handle);
+   EXIT();
    return 0;
 }
 
@@ -7502,6 +7462,7 @@
     int ret = 0;
     //v_CONTEXT_t pVosContext;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -7513,8 +7474,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -7551,6 +7510,7 @@
     sme_SetFTIEs( WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, extra,
         wrqu->data.length);
 
+    EXIT();
     return 0;
 }
 
@@ -7581,6 +7541,8 @@
     int idx;
     eHalStatus ret_val;
 
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -7592,8 +7554,6 @@
     ret_val = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret_val)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret_val;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -7695,6 +7655,7 @@
         }
     }
 
+    EXIT();
     return 0;
 }
 
@@ -7720,7 +7681,7 @@
     tpSirWlanSetRxpFilters wlanRxpFilterParam;
     int ret = 0;
 
-    hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: ", __func__);
+    ENTER();
 
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
@@ -7734,8 +7695,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     //Reset the filter to INI value as we have to clear the dynamic filter
@@ -7778,6 +7737,7 @@
         }
 
     }
+    EXIT();
     return 0;
 }
 
@@ -7805,6 +7765,8 @@
     tSirHostOffloadReq offloadRequest;
     int ret = 0;
 
+    ENTER();
+
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -7816,8 +7778,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -7876,6 +7836,7 @@
         return -EINVAL;
     }
 
+    EXIT();
     return 0;
 }
 
@@ -7902,6 +7863,7 @@
     tSirKeepAliveReq keepaliveRequest;
     int ret = 0;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -7913,8 +7875,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     /* Debug display of request components. */
@@ -7964,7 +7924,7 @@
                __func__);
         return -EINVAL;
     }
-
+    EXIT();
     return 0;
 }
 
@@ -8352,6 +8312,7 @@
     int ret = 0;
     struct iw_point s_priv_data;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -8363,8 +8324,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
     if (hdd_priv_get_data(&s_priv_data, wrqu))
@@ -8390,6 +8349,7 @@
     ret = wlan_hdd_set_filter(WLAN_HDD_GET_CTX(pAdapter), pRequest, pAdapter->sessionId);
     kfree(pRequest);
 
+    EXIT();
     return ret;
 }
 
@@ -8436,8 +8396,6 @@
   ret = wlan_hdd_validate_context(pHddCtx);
   if (0 != ret)
   {
-      VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                "%s: HDD context is not valid",__func__);
       return ret;
   }
   pStats = &(pAdapter->hdd_stats.summary_stat);
@@ -9033,7 +8991,9 @@
     hdd_adapter_t *pAdapter;
     hdd_context_t *pHddCtx;
     int ret = 0;
+    VOS_STATUS status;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -9046,8 +9006,6 @@
     ret = wlan_hdd_validate_context(pHddCtx);
     if (0 != ret)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return ret;
     }
 
@@ -9055,7 +9013,10 @@
     VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                 "Set PNO Private");
 
-    return iw_set_pno(dev,info,wrqu,extra,0);
+    status = iw_set_pno(dev,info,wrqu,extra,0);
+
+    EXIT();
+    return status;
 }
 
 static int iw_set_pno_priv(struct net_device *dev,
@@ -9087,6 +9048,7 @@
     tpAniSirGlobal pMac;
     int retval = 0;
 
+    ENTER();
     pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
     if (NULL == pAdapter)
     {
@@ -9098,8 +9060,6 @@
     retval = wlan_hdd_validate_context(pHddCtx);
     if (0 != retval)
     {
-        VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                  "%s: HDD context is not valid",__func__);
         return retval;
     }
     hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -9320,6 +9280,7 @@
              }
         }
     }
+    EXIT();
     return ret;
 }
 
@@ -9405,8 +9366,8 @@
   v_U8_t  ucType;
   v_U32_t  uTotalSize, uValue;
   int ret = 0;
-  /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+  ENTER();
   pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
   if (NULL == pAdapter)
   {
@@ -9419,8 +9380,6 @@
   ret = wlan_hdd_validate_context(pHddCtx);
   if (0 != ret)
   {
-      VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                "%s: HDD context is not valid",__func__);
       return ret;
   }
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -9542,6 +9501,7 @@
   /* put the device back to power save*/
   wlan_hdd_enter_bmps(pAdapter, DRIVER_POWER_MODE_AUTO);
 
+  EXIT();
   return VOS_STATUS_SUCCESS;
 }/*iw_set_power_params*/