summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com>2014-04-29 19:15:47 +0530
committerAkash Patel <c_akashp@qca.qualcomm.com>2014-04-29 23:02:38 -0700
commit83fa8c868b0924eb14eeb3410ed25c5927744459 (patch)
tree19c551489ea3794905ec3931b5054ebe4fb61420
parent301a18412cac845e5a1675f70d8d72a90ed34314 (diff)
wlan: Fix code review comments HDD Log enhancement - Phase 1
This CR is to fix the code review comments on HDD Log enhancement - Phase 1. Code is already picked up,hence new CR to fix the comments Change-Id: I9a8ca430cba825c3c1bdb8f3fcfcdf3cfdf0fc12 CRs-fixed: 653269
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c14
-rw-r--r--CORE/HDD/src/wlan_hdd_main.c17
2 files changed, 16 insertions, 15 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index feea681a6c0e..229a829efacc 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2824,7 +2824,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy,
ret = wait_for_completion_interruptible_timeout(
&pScanInfo->abortscan_event_var,
msecs_to_jiffies(WLAN_WAIT_TIME_ABORTSCAN));
- if (0 >= ret)
+ if (ret <= 0)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
FL("Timeout occurred while waiting for abortscan %ld"),
@@ -2848,7 +2848,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy,
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
FL("session(%d) beacon data points to NULL"),
pAdapter->sessionId);
- return -ENOENT;
+ return -EINVAL;
}
hdd_cleanup_actionframe(pHddCtx, pAdapter);
@@ -3059,7 +3059,7 @@ static int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
FL("session(%d) beacon data points to NULL"),
pAdapter->sessionId);
- return -ENOENT;
+ return -EINVAL;
}
status = wlan_hdd_cfg80211_alloc_new_beacon(pAdapter, &new, params, 0);
@@ -5357,7 +5357,7 @@ static eHalStatus hdd_cfg80211_scan_done_callback(tHalHandle halHandle,
if (waitRet <= 0)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s wait on scan_req_completion_event failed %ld",__func__, waitRet);
+ "%s wait on scan_req_completion_event failed %ld", __func__, waitRet);
VOS_ASSERT(pScanInfo->mScanPending);
goto allow_suspend;
}
@@ -9896,12 +9896,12 @@ static int wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *d
case NL80211_TDLS_DISCOVERY_REQ:
/* We don't support in-driver setup/teardown/discovery */
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: We don't support in-driver setup/teardown/discovery "
- ,__func__);
+ "%s: We don't support in-driver setup/teardown/discovery",
+ __func__);
return -ENOTSUPP;
default:
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: unsupported event",__func__);
+ "%s: unsupported event", __func__);
return -ENOTSUPP;
}
return 0;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 7eb02ff8acc9..7b6006f8250a 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -879,7 +879,7 @@ void hdd_checkandupdate_phymode( hdd_context_t *pHddCtx)
ret = wait_for_completion_interruptible_timeout(&pAdapter->disconnect_comp_var,
msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- if (0 >= ret)
+ if (ret <= 0)
hddLog(LOGE, FL("failure waiting for disconnect_comp_var %ld"),
ret);
}
@@ -7610,7 +7610,8 @@ VOS_STATUS hdd_init_station_mode( hdd_adapter_t *pAdapter )
if (rc <= 0)
{
hddLog(VOS_TRACE_LEVEL_FATAL,
- "Session is not opened within timeout period code %ld", rc );
+ FL("Session is not opened within timeout period code %ld"),
+ rc );
status = VOS_STATUS_E_FAILURE;
goto error_sme_open;
}
@@ -7722,8 +7723,8 @@ void hdd_cleanup_actionframe( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter )
if (rc <= 0)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s ERROR: HDD Wait for Action Confirmation Failed!! %ld"
- , __func__, rc);
+ "%s HDD Wait for Action Confirmation Failed!! %ld",
+ __func__, rc);
}
}
return;
@@ -8118,7 +8119,7 @@ hdd_adapter_t* hdd_open_adapter( hdd_context_t *pHddCtx, tANI_U8 session_type,
if(VOS_STATUS_E_FAILURE == exitbmpsStatus)
{
//Fail to Exit BMPS
- hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Fail to Exit BMPS", __func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("Fail to Exit BMPS"));
VOS_ASSERT(0);
return NULL;
}
@@ -9798,15 +9799,15 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx)
if (VOS_FTM_MODE == hdd_get_conparam())
{
- hddLog(VOS_TRACE_LEVEL_INFO,"%s: FTM MODE",__func__);
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: FTM MODE", __func__);
#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC) && defined(QCA_WIFI_FTM)
if (hdd_ftm_stop(pHddCtx))
{
- hddLog(VOS_TRACE_LEVEL_FATAL,"%s: hdd_ftm_stop Failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_ftm_stop Failed", __func__);
}
#endif
wlan_hdd_ftm_close(pHddCtx);
- hddLog(VOS_TRACE_LEVEL_FATAL,"%s: FTM driver unloaded", __func__);
+ hddLog(VOS_TRACE_LEVEL_FATAL, "%s: FTM driver unloaded", __func__);
goto free_hdd_ctx;
}
//Stop the Interface TX queue.