summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishank Aggarwal <naggar@codeaurora.org>2017-04-04 14:17:13 +0530
committerSandeep Puligilla <spuligil@codeaurora.org>2017-04-06 14:11:05 -0700
commit38763cb0e67c192e95283d671f530c86822e12da (patch)
tree484ec68b2fb20932de5c2ad8418e0a207aeed294
parentef6d78dfc380f6ee4642d255bddf58dcc25e8c7c (diff)
qcacld-3.0: Fix kernel checkpatch warnings in sme_power_save.c
Fix kernel checkpatch warnings in sme_power_save.c Change-Id: I3d4631c37815a54206f1f5bc5122d5d451a6944a CRs-Fixed: 2025503
-rw-r--r--core/sme/src/common/sme_power_save.c35
1 files changed, 20 insertions, 15 deletions
diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c
index 6822a7194ce5..79031a09eb94 100644
--- a/core/sme/src/common/sme_power_save.c
+++ b/core/sme/src/common/sme_power_save.c
@@ -127,6 +127,7 @@ static void sme_set_ps_state(tpAniSirGlobal mac_ctx,
{
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
+
ps_param->ps_state = ps_state;
}
@@ -405,6 +406,7 @@ static QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx,
uint32_t session_id)
{
struct sSirHalWowlExitParams *hal_wowl_msg;
+
hal_wowl_msg = qdf_mem_malloc(sizeof(*hal_wowl_msg));
if (NULL == hal_wowl_msg) {
sme_err("Fail to allocate memory for WoWLAN Add Bcast Pattern");
@@ -518,6 +520,7 @@ QDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id,
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
+
status = sme_enable_sta_ps_check(mac_ctx, session_id);
if (status != QDF_STATUS_SUCCESS)
return status;
@@ -537,6 +540,7 @@ QDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id)
QDF_STATUS status = QDF_STATUS_E_FAILURE;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
+
status = sme_enable_sta_ps_check(mac_ctx, session_id);
if (status != QDF_STATUS_SUCCESS)
return status;
@@ -560,6 +564,7 @@ QDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id)
QDF_STATUS status = QDF_STATUS_E_FAILURE;
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
+
status = sme_enable_sta_ps_check(mac_ctx, session_id);
if (status != QDF_STATUS_SUCCESS)
return status;
@@ -653,7 +658,6 @@ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx,
ps_param->uapsd_per_ac_delivery_enable_mask);
sme_debug("New ps_param->ac_admit_mask[SIR_MAC_DIRECTION_UPLINK]: 0x%x",
ps_param->ac_admit_mask[SIR_MAC_DIRECTION_UPLINK]);
- return;
}
/**
@@ -670,6 +674,7 @@ QDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id,
void *callback_context)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
+
status = sme_ps_uapsd_enable(hal_ctx, session_id);
return status;
}
@@ -733,7 +738,8 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
}
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
- "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__,
+ "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x",
+ __func__,
*((uint32_t *) &request->aNetworks[0].ssId.ssId[0]),
*((uint32_t *) &request->aNetworks[0].ssId.ssId[4]),
*((uint32_t *) &request->aNetworks[0].ssId.ssId[8]),
@@ -925,7 +931,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
request_buf = qdf_mem_malloc(sizeof(*request_buf));
if (NULL == request_buf) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- FL("Not able to allocate memory for NS offload request"));
+ "Not able to allocate memory for NS offload request");
return QDF_STATUS_E_NOMEM;
}
*request_buf = *request;
@@ -938,7 +944,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
if (QDF_STATUS_SUCCESS !=
cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL"));
+ "Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL");
qdf_mem_free(request_buf);
return QDF_STATUS_E_FAILURE;
}
@@ -947,7 +953,6 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
}
#endif /* WLAN_NS_OFFLOAD */
-/* -------------------------------------------------------------------- */
/**
* sme_post_pe_message
*
@@ -967,6 +972,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
{
QDF_STATUS qdf_status;
+
qdf_status = cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) msg);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
sme_err("cds_mq_post_message failed with status: %d",
@@ -1054,9 +1060,9 @@ QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id)
tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[session_id];
+
ps_param->session_id = session_id;
ps_param->mac_ctx = mac_ctx;
-
/* Allocate a timer to enable ps automatically */
if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_init(
&ps_param->auto_ps_enable_timer,
@@ -1076,19 +1082,18 @@ void sme_auto_ps_entry_timer_expired(void *data)
tpAniSirGlobal mac_ctx = (tpAniSirGlobal)ps_params->mac_ctx;
uint32_t session_id = ps_params->session_id;
QDF_STATUS status = QDF_STATUS_SUCCESS;
- status = sme_enable_sta_ps_check(mac_ctx, session_id);
- if (QDF_STATUS_SUCCESS == status) {
+ status = sme_enable_sta_ps_check(mac_ctx, session_id);
+ if (QDF_STATUS_SUCCESS == status)
sme_ps_enable_disable((tHalHandle)mac_ctx, session_id,
SME_PS_ENABLE);
- } else {
+ else {
status =
qdf_mc_timer_start(&ps_params->auto_ps_enable_timer,
AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(status)
- && (QDF_STATUS_E_ALREADY != status)) {
+ && (QDF_STATUS_E_ALREADY != status))
sme_err("Cannot start traffic timer");
- }
}
}
@@ -1115,9 +1120,9 @@ QDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id)
*/
if (QDF_TIMER_STATE_RUNNING ==
qdf_mc_timer_get_current_state(
- &ps_param->auto_ps_enable_timer)) {
+ &ps_param->auto_ps_enable_timer))
qdf_mc_timer_stop(&ps_param->auto_ps_enable_timer);
- }
+
qdf_status =
qdf_mc_timer_destroy(&ps_param->auto_ps_enable_timer);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -1137,9 +1142,9 @@ bool sme_is_auto_ps_timer_running(tHalHandle hal_ctx,
*/
if (QDF_TIMER_STATE_RUNNING ==
qdf_mc_timer_get_current_state(
- &ps_param->auto_ps_enable_timer)) {
+ &ps_param->auto_ps_enable_timer))
status = true;
- }
+
return status;
}