WiFi-HAL: Cleanup unnecessary logs

Cleanup unnecessary logs from llstats, gscan, rssi monitor
common and tdls modules.

Change-Id: If66a8f61b11a101d84546a06514aeb5e0d8fcbfa
Bug: 23942132

8 files changed, 53 insertions, 103 deletions

diff --git a/qcwcn/wifi_hal/common.cpp b/qcwcn/wifi_hal/common.cpp
index 89ff67a..a8f5e30 100644
--- a/qcwcn/wifi_hal/common.cpp
+++ b/qcwcn/wifi_hal/common.cpp
@@ -394,7 +394,7 @@ lowi_cb_table_t *getLowiCallbackTable(u32 requested_lowi_capabilities)
     bool lowi_get_capabilities_support = false;
 
     if (requested_lowi_capabilities == GSCAN_SUPPORTED) {
-        ALOGI("%s: Returning Null, GSCAN not supported by lowi",
+        ALOGV("%s: Returning Null, GSCAN not supported by lowi",
               __FUNCTION__);
         return NULL;
     }
diff --git a/qcwcn/wifi_hal/cpp_bindings.cpp b/qcwcn/wifi_hal/cpp_bindings.cpp
index 6a1a8f0..381d8c8 100644
--- a/qcwcn/wifi_hal/cpp_bindings.cpp
+++ b/qcwcn/wifi_hal/cpp_bindings.cpp
@@ -849,7 +849,6 @@ int WifiVendorCommand::create() {
 
     //insert the iface id to be "wlan0"
     ifindex = if_nametoindex("wlan0");
-    ALOGE("%s ifindex obtained:%d",__FUNCTION__,ifindex);
     mMsg.set_iface_id(ifindex);
 out:
     return ret;
@@ -971,7 +970,6 @@ void WifiVendorCommand::attr_end(struct nlattr *attribute)
 int WifiVendorCommand::set_iface_id(const char* name)
 {
     unsigned ifindex = if_nametoindex(name);
-    ALOGE("%s ifindex obtained:%d", __FUNCTION__,ifindex);
     return mMsg.set_iface_id(ifindex);
 }
 
diff --git a/qcwcn/wifi_hal/gscan.cpp b/qcwcn/wifi_hal/gscan.cpp
index e38a879..69a54b0 100644
--- a/qcwcn/wifi_hal/gscan.cpp
+++ b/qcwcn/wifi_hal/gscan.cpp
@@ -98,7 +98,7 @@ wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->get_valid_channels == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->get_valid_channels(handle, band, max_channels,
                           channels, num_channels);
@@ -111,7 +111,7 @@ wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
      * Generate one randomly.
      */
     requestId = get_requestid();
-    ALOGI("%s: RequestId:%d Enter band:%d max_channels:%d", __FUNCTION__,
+    ALOGI("%s: RequestId:%d band:%d max_channels:%d", __FUNCTION__,
           requestId, band, max_channels);
 
     if (channels == NULL) {
@@ -170,7 +170,6 @@ wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
 
 cleanup:
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -196,7 +195,7 @@ wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->get_gscan_capabilities == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->get_gscan_capabilities(handle,
                                                      capabilities);
@@ -209,7 +208,7 @@ wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
      * Generate it randomly.
      */
     requestId = get_requestid();
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, requestId);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, requestId);
 
     if (capabilities == NULL) {
         ALOGE("%s: NULL capabilities pointer provided. Exit.",
@@ -267,7 +266,6 @@ wifi_error wifi_get_gscan_capabilities(wifi_interface_handle handle,
 cleanup:
     gScanCommand->freeRspParams(eGScanGetCapabilitiesRspParams);
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -304,7 +302,7 @@ wifi_error wifi_start_gscan(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->start_gscan  == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->start_gscan(id, iface, params, handler);
         ALOGI("%s: lowi start_gscan "
@@ -312,7 +310,7 @@ wifi_error wifi_start_gscan(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d ", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d ", __FUNCTION__, id);
     /* Wi-Fi HAL doesn't need to check if a similar request to start gscan was
      *  made earlier. If start_gscan() is called while another gscan is already
      *  running, the request will be sent down to driver and firmware. If new
@@ -497,7 +495,6 @@ cleanup:
             __FUNCTION__, ret);
         gScanStartCmdEventHandler->disableEventHandling();
     }
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -529,7 +526,7 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->stop_gscan == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->stop_gscan(id, iface);
         ALOGI("%s: lowi stop_gscan "
@@ -537,7 +534,7 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
     if (gScanStartCmdEventHandler == NULL ||
         gScanStartCmdEventHandler->isEventHandlingEnabled() == false) {
         ALOGE("%s: GSCAN isn't running or already stopped. "
@@ -590,7 +587,6 @@ wifi_error wifi_stop_gscan(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -625,7 +621,7 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->set_bssid_hotlist == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->set_bssid_hotlist(id, iface, params,handler);
         ALOGI("%s: lowi set_bssid_hotlist "
@@ -633,7 +629,7 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set bssid
      * hotlist was made earlier. If set_bssid_hotlist() is called while
@@ -771,7 +767,6 @@ cleanup:
             __FUNCTION__, ret);
         gScanSetBssidHotlistCmdEventHandler->disableEventHandling();
     }
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -802,7 +797,7 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->reset_bssid_hotlist == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->reset_bssid_hotlist(id, iface);
         ALOGI("%s: lowi reset_bssid_hotlist "
@@ -810,7 +805,7 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     if (gScanSetBssidHotlistCmdEventHandler == NULL ||
         (gScanSetBssidHotlistCmdEventHandler->isEventHandlingEnabled() ==
@@ -865,7 +860,6 @@ wifi_error wifi_reset_bssid_hotlist(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -900,7 +894,7 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->set_significant_change_handler == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->set_significant_change_handler(id,
                                                              iface,
@@ -911,7 +905,7 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set significant
      * change list was made earlier. If set_significant_change() is called while
@@ -1061,7 +1055,6 @@ cleanup:
         gScanSetSignificantChangeCmdEventHandler->disableEventHandling();
     }
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1093,7 +1086,7 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->reset_significant_change_handler == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->reset_significant_change_handler(id, iface);
         ALOGI("%s: lowi reset_significant_change_handler "
@@ -1101,7 +1094,7 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     if (gScanSetSignificantChangeCmdEventHandler == NULL ||
         (gScanSetSignificantChangeCmdEventHandler->isEventHandlingEnabled() ==
@@ -1158,7 +1151,6 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1193,7 +1185,7 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->get_cached_gscan_results == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->get_cached_gscan_results(iface,
                                                        flush,
@@ -1208,7 +1200,7 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
     /* No request id from caller, so generate one and pass it on to the driver. */
     /* Generate it randomly */
     requestId = get_requestid();
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, requestId);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, requestId);
 
     if (results == NULL || num == NULL) {
         ALOGE("%s: NULL pointer provided. Exit.",
@@ -1307,7 +1299,6 @@ wifi_error wifi_get_cached_gscan_results(wifi_interface_handle iface,
 cleanup:
     gScanCommand->freeRspParams(eGScanGetCachedResultsRspParams);
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1320,8 +1311,6 @@ wifi_error wifi_set_scanning_mac_oui(wifi_interface_handle handle, oui scan_oui)
     interface_info *iinfo = getIfaceInfo(handle);
     wifi_handle wifiHandle = getWifiHandle(handle);
 
-    ALOGI("%s: Enter", __FUNCTION__);
-
     vCommand = new WifiVendorCommand(wifiHandle, 0,
             OUI_QCA,
             QCA_NL80211_VENDOR_SUBCMD_SCANNING_MAC_OUI);
@@ -1344,7 +1333,8 @@ wifi_error wifi_set_scanning_mac_oui(wifi_interface_handle handle, oui scan_oui)
     if (!nlData)
         goto cleanup;
 
-    ALOGI("MAC_OUI - %02x:%02x:%02x", scan_oui[0], scan_oui[1], scan_oui[2]);
+    ALOGI("%s: MAC_OUI - %02x:%02x:%02x", __FUNCTION__,
+          scan_oui[0], scan_oui[1], scan_oui[2]);
 
     /* Add the fixed part of the mac_oui to the nl command */
     ret = vCommand->put_bytes(
@@ -1364,7 +1354,6 @@ wifi_error wifi_set_scanning_mac_oui(wifi_interface_handle handle, oui scan_oui)
 
 cleanup:
     delete vCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1400,7 +1389,7 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->set_ssid_hotlist == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->set_ssid_hotlist(id, iface, params,handler);
         ALOGI("%s: lowi set_ssid_hotlist "
@@ -1408,7 +1397,7 @@ wifi_error wifi_set_ssid_hotlist(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set ssid
      * hotlist was made earlier. If set_ssid_hotlist() is called while
@@ -1552,7 +1541,6 @@ cleanup:
             __FUNCTION__, ret);
         gScanSetSsidHotlistCmdEventHandler->disableEventHandling();
     }
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1583,7 +1571,7 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
     lowiWifiHalApi = getLowiCallbackTable(GSCAN_SUPPORTED);
     if (lowiWifiHalApi == NULL ||
         lowiWifiHalApi->reset_ssid_hotlist == NULL) {
-        ALOGI("%s: Sending cmd directly to host", __FUNCTION__);
+        ALOGD("%s: Sending cmd directly to host", __FUNCTION__);
     } else {
         ret = lowiWifiHalApi->reset_ssid_hotlist(id, iface);
         ALOGI("%s: lowi reset_ssid_hotlist "
@@ -1591,7 +1579,7 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     if (gScanSetSsidHotlistCmdEventHandler == NULL ||
         (gScanSetSsidHotlistCmdEventHandler->isEventHandlingEnabled() ==
@@ -1646,7 +1634,6 @@ wifi_error wifi_reset_ssid_hotlist(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -1966,7 +1953,7 @@ int GScanCommand::handleResponse(WifiEvent &reply) {
 int GScanCommand::gscan_parse_capabilities(struct nlattr **tbVendor)
 {
     if (!mGetCapabilitiesRspParams){
-        ALOGE("%s: mGetCapabilitiesRspParams ptr is NULL. Exit. ",
+        ALOGE("%s: mGetCapabilitiesRspParams ptr is NULL. Exit.",
             __FUNCTION__);
         return WIFI_ERROR_INVALID_ARGS;
     }
@@ -2420,7 +2407,7 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set ePNO
      * list was made earlier. If wifi_set_epno_list() is called while
@@ -2566,7 +2553,6 @@ cleanup:
             __FUNCTION__, ret);
         gScanSetPnoListCmdEventHandler->disableEventHandling();
     }
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -2596,7 +2582,7 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     /* Wi-Fi HAL doesn't need to check if a similar request to set ePNO
      * passpoint list was made earlier. If wifi_set_passpoint_list() is called
@@ -2741,7 +2727,6 @@ cleanup:
             __FUNCTION__, ret);
         gScanPnoSetPasspointListCmdEventHandler->disableEventHandling();
     }
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -2767,13 +2752,13 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     if (gScanPnoSetPasspointListCmdEventHandler == NULL ||
         (gScanPnoSetPasspointListCmdEventHandler->isEventHandlingEnabled() ==
          false)) {
         ALOGE("wifi_reset_passpoint_list: ePNO passpoint_list isn't set. "
-            "Nothing to do. Exit");
+            "Nothing to do. Exit.");
         return WIFI_ERROR_NOT_AVAILABLE;
     }
 
@@ -2832,7 +2817,6 @@ wifi_error wifi_reset_passpoint_list(wifi_request_id id,
 
 cleanup:
     delete gScanCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 }
 
@@ -2935,8 +2919,6 @@ wifi_error GScanCommand::copyCachedScanResults(
     int i;
     wifi_cached_scan_results *cachedResultRsp;
 
-    ALOGI("%s: Enter", __FUNCTION__);
-
     if (mGetCachedResultsRspParams && cached_results)
     {
         /* Populate the number of parsed cached results. */
@@ -2966,7 +2948,6 @@ wifi_error GScanCommand::copyCachedScanResults(
         *numResults = 0;
         ret = WIFI_ERROR_INVALID_ARGS;
     }
-    ALOGI("%s: Exit", __FUNCTION__);
     return ret;
 }
 
@@ -3013,7 +2994,7 @@ wifi_error wifi_set_ssid_white_list(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     ALOGI("Number of SSIDs : %d", num_networks);
     for (i = 0; i < num_networks; i++) {
@@ -3081,7 +3062,6 @@ wifi_error wifi_set_ssid_white_list(wifi_request_id id,
 
 cleanup:
     delete roamCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -3103,7 +3083,7 @@ wifi_error wifi_set_gscan_roam_params(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     if(params) {
         ALOGI("A_band_boost_threshold   %d", params->A_band_boost_threshold);
@@ -3180,7 +3160,6 @@ wifi_error wifi_set_gscan_roam_params(wifi_request_id id,
 
 cleanup:
     delete roamCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -3250,7 +3229,6 @@ wifi_error wifi_enable_lazy_roam(wifi_request_id id,
 
 cleanup:
     delete roamCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -3273,7 +3251,7 @@ wifi_error wifi_set_bssid_preference(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     ALOGI("Number of BSSIDs: %d", num_bssid);
     if(prefs && num_bssid) {
@@ -3352,7 +3330,6 @@ wifi_error wifi_set_bssid_preference(wifi_request_id id,
 
 cleanup:
     delete roamCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
@@ -3374,7 +3351,7 @@ wifi_error wifi_set_bssid_blacklist(wifi_request_id id,
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
-    ALOGI("%s: Enter RequestId:%d", __FUNCTION__, id);
+    ALOGI("%s: RequestId:%d", __FUNCTION__, id);
 
     for (i = 0; i < params.num_bssid; i++) {
         ALOGI("BSSID: %d : %02x:%02x:%02x:%02x:%02x:%02x", i,
@@ -3443,7 +3420,6 @@ wifi_error wifi_set_bssid_blacklist(wifi_request_id id,
 
 cleanup:
     delete roamCommand;
-    ALOGI("%s: Exit.", __FUNCTION__);
     return (wifi_error)ret;
 
 }
diff --git a/qcwcn/wifi_hal/llstats.cpp b/qcwcn/wifi_hal/llstats.cpp
index f8c63f8..2f84858 100644
--- a/qcwcn/wifi_hal/llstats.cpp
+++ b/qcwcn/wifi_hal/llstats.cpp
@@ -47,7 +47,6 @@ int LLStatsCommand::create() {
     if (ret < 0)
         goto out;
 
-    ALOGI("mVendor_id = %d, Subcmd = %d in  %s:%d\n", mVendor_id, mSubcmd, __func__, __LINE__);
 out:
     return ret;
 }
@@ -55,7 +54,6 @@ out:
 LLStatsCommand::LLStatsCommand(wifi_handle handle, int id, u32 vendor_id, u32 subcmd)
         : WifiVendorCommand(handle, id, vendor_id, subcmd)
 {
-    ALOGV("LLStatsCommand %p constructed", this);
     memset(&mClearRspParams, 0,sizeof(LLStatsClearRspParams));
     memset(&mResultsParams, 0,sizeof(LLStatsResultsParams));
     memset(&mHandler, 0,sizeof(mHandler));
@@ -63,7 +61,6 @@ LLStatsCommand::LLStatsCommand(wifi_handle handle, int id, u32 vendor_id, u32 su
 
 LLStatsCommand::~LLStatsCommand()
 {
-    ALOGW("LLStatsCommand %p distructor", this);
     mLLStatsCommandInstance = NULL;
 }
 
@@ -77,7 +74,6 @@ LLStatsCommand* LLStatsCommand::instance(wifi_handle handle)
         mLLStatsCommandInstance = new LLStatsCommand(handle, 0,
                 OUI_QCA,
                 QCA_NL80211_VENDOR_SUBCMD_LL_STATS_SET);
-        ALOGV("LLStatsCommand %p created", mLLStatsCommandInstance);
         return mLLStatsCommandInstance;
     }
     else
@@ -90,7 +86,6 @@ LLStatsCommand* LLStatsCommand::instance(wifi_handle handle)
             mLLStatsCommandInstance->mInfo = (hal_info *)handle;
         }
     }
-    ALOGV("LLStatsCommand %p created already", mLLStatsCommandInstance);
     return mLLStatsCommandInstance;
 }
 
@@ -1202,6 +1197,8 @@ wifi_error wifi_set_link_stats(wifi_interface_handle iface,
     interface_info *iinfo = getIfaceInfo(iface);
     wifi_handle handle = getWifiHandle(iface);
 
+    ALOGI("mpdu_size_threshold : %u, aggressive_statistics_gathering : %u",
+          params.mpdu_size_threshold, params.aggressive_statistics_gathering);
     LLCommand = LLStatsCommand::instance(handle);
     if (LLCommand == NULL) {
         ALOGE("%s: Error LLStatsCommand NULL", __func__);
@@ -1314,6 +1311,7 @@ wifi_error wifi_clear_link_stats(wifi_interface_handle iface,
     interface_info *iinfo = getIfaceInfo(iface);
     wifi_handle handle = getWifiHandle(iface);
 
+    ALOGI("clear_req : %x, stop_req : %u", stats_clear_req_mask, stop_req);
     LLCommand = LLStatsCommand::instance(handle);
     if (LLCommand == NULL) {
         ALOGE("%s: Error LLStatsCommand NULL", __func__);
diff --git a/qcwcn/wifi_hal/rssi_monitor.cpp b/qcwcn/wifi_hal/rssi_monitor.cpp
index a276b55..06bb835 100644
--- a/qcwcn/wifi_hal/rssi_monitor.cpp
+++ b/qcwcn/wifi_hal/rssi_monitor.cpp
@@ -71,7 +71,6 @@ RSSIMonitorCommand* RSSIMonitorCommand::instance(wifi_handle handle,
         mRSSIMonitorCommandInstance = new RSSIMonitorCommand(handle, id,
                 OUI_QCA,
                 QCA_NL80211_VENDOR_SUBCMD_MONITOR_RSSI);
-        ALOGV("RSSIMonitorCommand %p created", mRSSIMonitorCommandInstance);
         return mRSSIMonitorCommandInstance;
     }
     else
@@ -85,7 +84,6 @@ RSSIMonitorCommand* RSSIMonitorCommand::instance(wifi_handle handle,
         }
         mRSSIMonitorCommandInstance->setReqId(id);
     }
-    ALOGV("RSSIMonitorCommand %p created already", mRSSIMonitorCommandInstance);
     return mRSSIMonitorCommandInstance;
 }
 
@@ -130,7 +128,7 @@ int RSSIMonitorCommand::handleEvent(WifiEvent &event)
              *  request_id value which we're maintaining.
              */
             if (reqId != id()) {
-                ALOGE("%s: Event has Req. ID:%d <> Ours:%d, continue...",
+                ALOGD("%s: Event has Req. ID:%d <> Ours:%d, continue...",
                     __FUNCTION__, reqId, id());
                 reqId = id();
             }
@@ -207,7 +205,8 @@ wifi_error wifi_start_rssi_monitoring(wifi_request_id id,
         return (wifi_error)ret;
     }
 
-    ALOGI("Max RSSI : %d\nMin RSSI : %d", max_rssi, min_rssi);
+    ALOGI("%s: Max RSSI:%d Min RSSI:%d", __FUNCTION__,
+          max_rssi, min_rssi);
     /* Add the vendor specific attributes for the NL command. */
     nlData = vCommand->attr_start(NL80211_ATTR_VENDOR_DATA);
     if (!nlData)
diff --git a/qcwcn/wifi_hal/tdls.cpp b/qcwcn/wifi_hal/tdls.cpp
index af6bdcf..f7eafad 100755
--- a/qcwcn/wifi_hal/tdls.cpp
+++ b/qcwcn/wifi_hal/tdls.cpp
@@ -189,7 +189,6 @@ int TdlsCommand::handleEvent(WifiEvent &event)
 
 int TdlsCommand::handleResponse(WifiEvent &reply)
 {
-    ALOGI("Received a TDLS response message from Driver");
     u32 status;
     int i = 0;
     WifiVendorCommand::handleResponse(reply);
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index 7d73525..4d5c02e 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -127,7 +127,6 @@ static nl_sock * wifi_create_nl_socket(int port, int protocol)
         return NULL;
     }
 
-    ALOGI("Socket Value:%p", sock);
     return sock;
 }
 
@@ -323,7 +322,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
 
     memset(info, 0, sizeof(*info));
 
-    ALOGI("Creating socket");
     cmd_sock = wifi_create_nl_socket(WIFI_HAL_CMD_SOCK_PORT,
                                                      NETLINK_GENERIC);
     if (cmd_sock == NULL) {
@@ -338,9 +336,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
                    strerror(errno));
         /* continue anyway with the default (smaller) buffer */
     }
-    else {
-        ALOGI("nl_socket_set_buffer_size for cmd_sock successful");
-    }
 
     event_sock =
         wifi_create_nl_socket(WIFI_HAL_EVENT_SOCK_PORT, NETLINK_GENERIC);
@@ -356,9 +351,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
                    strerror(errno));
         /* continue anyway with the default (smaller) buffer */
     }
-    else {
-        ALOGI("nl_socket_set_buffer_size for event_sock successful");
-    }
 
     cb = nl_socket_get_cb(event_sock);
     if (cb == NULL) {
@@ -406,7 +398,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
         ret = WIFI_ERROR_UNKNOWN;
         goto unload;
     }
-    ALOGI("%s: family_id:%d", __func__, info->nl80211_family_id);
 
     pthread_mutex_init(&info->cb_lock, NULL);
 
@@ -466,7 +457,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
         ret = WIFI_SUCCESS;
     }
 
-    ALOGI("Initializing Wifi Logger Rings");
     ret = wifi_logger_ring_buffers_init(info);
     if (ret != WIFI_SUCCESS) {
         ALOGE("Wifi Logger Ring Initialization Failed");
@@ -723,7 +713,7 @@ static int internal_valid_message_handler(nl_msg *msg, void *arg)
                   event.get_cmdString(), vendor_id, subcmd);
         }
     } else {
-        ALOGI("event received %s", event.get_cmdString());
+        ALOGV("event received %s", event.get_cmdString());
     }
 
     // event.log();
@@ -930,7 +920,6 @@ wifi_error wifi_init_interfaces(wifi_handle handle)
     closedir(d);
 
     info->num_interfaces = n;
-    ALOGI("Found %d interfaces", info->num_interfaces);
 
     return WIFI_SUCCESS;
 }
@@ -1031,7 +1020,6 @@ wifi_error wifi_get_concurrency_matrix(wifi_interface_handle handle,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete vCommand;
     if (ret) {
         *set_size = 0;
diff --git a/qcwcn/wifi_hal/wificonfig.cpp b/qcwcn/wifi_hal/wificonfig.cpp
index 5c41369..e332895 100644
--- a/qcwcn/wifi_hal/wificonfig.cpp
+++ b/qcwcn/wifi_hal/wificonfig.cpp
@@ -46,7 +46,7 @@ wifi_error wifi_extended_dtim_config_set(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGD("wifi_extended_dtim_config_set(): Enter");
+    ALOGD("%s: extended_dtim:%d", __FUNCTION__, extended_dtim);
 
     wifiConfigCommand = new WiFiConfigCommand(
                             wifiHandle,
@@ -55,7 +55,7 @@ wifi_error wifi_extended_dtim_config_set(wifi_request_id id,
                             QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION);
 
     if (wifiConfigCommand == NULL) {
-        ALOGE("%s: Error wifiConfigCommand NULL", __func__);
+        ALOGE("%s: Error wifiConfigCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -100,7 +100,6 @@ wifi_error wifi_extended_dtim_config_set(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete wifiConfigCommand;
     return (wifi_error)ret;
 }
@@ -116,7 +115,7 @@ wifi_error wifi_set_country_code(wifi_interface_handle iface,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGD("wifi_set_country_code(): %s", country_code);
+    ALOGD("%s: %s", __FUNCTION__, country_code);
 
     /* No request id from caller, so generate one and pass it on to the driver.
      * Generate it randomly.
@@ -129,7 +128,7 @@ wifi_error wifi_set_country_code(wifi_interface_handle iface,
                             OUI_QCA,
                             QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION);
     if (wifiConfigCommand == NULL) {
-        ALOGE("%s: Error wifiConfigCommand NULL", __func__);
+        ALOGE("%s: Error wifiConfigCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -155,7 +154,6 @@ wifi_error wifi_set_country_code(wifi_interface_handle iface,
     usleep(WAIT_TIME_FOR_SET_REG_DOMAIN);
 
 cleanup:
-    ALOGV("%s: Delete object.", __func__);
     delete wifiConfigCommand;
     return (wifi_error)ret;
 }
@@ -172,14 +170,14 @@ wifi_error wifi_set_beacon_wifi_iface_stats_averaging_factor(
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGD("wifi_set_beacon_wifi_iface_stats_averaging_factor(): Enter");
+    ALOGD("%s factor:%u", __FUNCTION__, factor);
     wifiConfigCommand = new WiFiConfigCommand(
                             wifiHandle,
                             id,
                             OUI_QCA,
                             QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION);
     if (wifiConfigCommand == NULL) {
-        ALOGE("%s: Error wifiConfigCommand NULL", __func__);
+        ALOGE("%s: Error wifiConfigCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -225,7 +223,6 @@ wifi_error wifi_set_beacon_wifi_iface_stats_averaging_factor(
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete wifiConfigCommand;
     return (wifi_error)ret;
 }
@@ -241,7 +238,7 @@ wifi_error wifi_set_guard_time(wifi_request_id id,
     wifi_handle wifiHandle = getWifiHandle(iface);
     hal_info *info = getHalInfo(wifiHandle);
 
-    ALOGD("wifi_set_guard_time(): Enter");
+    ALOGD("%s : guard_time:%u", __FUNCTION__, guard_time);
 
     wifiConfigCommand = new WiFiConfigCommand(
                             wifiHandle,
@@ -249,7 +246,7 @@ wifi_error wifi_set_guard_time(wifi_request_id id,
                             OUI_QCA,
                             QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION);
     if (wifiConfigCommand == NULL) {
-        ALOGE("%s: Error wifiConfigCommand NULL", __func__);
+        ALOGE("%s: Error wifiConfigCommand NULL", __FUNCTION__);
         return WIFI_ERROR_UNKNOWN;
     }
 
@@ -291,7 +288,6 @@ wifi_error wifi_set_guard_time(wifi_request_id id,
     }
 
 cleanup:
-    ALOGI("%s: Delete object.", __func__);
     delete wifiConfigCommand;
     return (wifi_error)ret;
 }
@@ -326,16 +322,12 @@ int WiFiConfigCommand::create() {
     ret = mMsg.put_u32(NL80211_ATTR_VENDOR_SUBCMD, mSubcmd);
     if (ret < 0)
         goto out;
-
-     ALOGI("%s: mVendor_id = %d, Subcmd = %d.",
-        __func__, mVendor_id, mSubcmd);
 out:
     return ret;
 }
 
 /* This function implements creation of generic NL command */
 int WiFiConfigCommand::create_generic(u8 cmdId) {
-    ALOGI("%s: cmdId = %d", __func__, cmdId);
     int ret = mMsg.create(cmdId, 0, 0);
     return ret;
 }
@@ -354,7 +346,7 @@ static int error_handler_wifi_config(struct sockaddr_nl *nla,
     int *ret = (int *)arg;
     tmp = nla;
     *ret = err->error;
-    ALOGE("%s: Error code:%d (%s)", __func__, *ret, strerror(-(*ret)));
+    ALOGE("%s: Error code:%d (%s)", __FUNCTION__, *ret, strerror(-(*ret)));
     return NL_STOP;
 }
 
@@ -393,7 +385,7 @@ int WiFiConfigCommand::requestEvent()
 
     cb = nl_cb_alloc(NL_CB_DEFAULT);
     if (!cb) {
-        ALOGE("%s: Callback allocation failed",__func__);
+        ALOGE("%s: Callback allocation failed",__FUNCTION__);
         res = -1;
         goto out;
     }
@@ -421,10 +413,10 @@ int WiFiConfigCommand::requestEvent()
         res = mCondition.wait(abstime);
         if (res == ETIMEDOUT)
         {
-            ALOGE("%s: Time out happened.", __func__);
+            ALOGE("%s: Time out happened.", __FUNCTION__);
         }
         ALOGD("%s: Command invoked return value:%d, mWaitForRsp=%d",
-            __func__, res, mWaitforRsp);
+            __FUNCTION__, res, mWaitforRsp);
     }
 out:
     /* Cleanup the mMsg */