summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaram Sudha <dsudha@qti.qualcomm.com>2014-01-22 01:20:00 +0530
committerPrakash Dhavali <pdhavali@qca.qualcomm.com>2014-01-26 21:37:00 -0800
commit19787a76557550661c202bfe1f938ef5e5097e0e (patch)
treec0cb9494365ed23ebaaf89f4391e977002257594
parentc665b639f10859b30d80911398c8ba96971ec2be (diff)
qcacld: Static source analysis errors in CLD_TXRX module.
Running static source analysis on CORE/SERVICES/COMMON module generates quite a few errors/warnings. This fix will help to remove those errors and warnings.It includes null check comparisons and voiding repeatitive null checks. Addressing review comments raise on gerrit: https://review-android.quicinc.com/#/c/589558/ Change-Id: I3508603ffdffd723ef4d969db6649693328bcb4f CRs-Fixed: 601373
-rw-r--r--CORE/CLD_TXRX/TLSHIM/tl_shim.c52
-rw-r--r--CORE/CLD_TXRX/TXRX/ol_rx.c2
-rw-r--r--CORE/CLD_TXRX/TXRX/ol_txrx.c4
-rw-r--r--CORE/CLD_TXRX/TXRX/ol_txrx_event.c2
4 files changed, 22 insertions, 38 deletions
diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
index 417185357241..4e548a9e8a6f 100644
--- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c
+++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
@@ -335,7 +335,7 @@ static void tlshim_mgmt_rx_dxe_handler(void *context, adf_nbuf_t buflist)
rx_packet =
(vos_pkt_t *)adf_os_mem_alloc(NULL, sizeof(vos_pkt_t));
- if(rx_packet == NULL) {
+ if(!rx_packet) {
TLSHIM_LOGE("Rx Packet Mem Alloc Failed");
adf_nbuf_free(cur);
goto next_nbuf;
@@ -409,8 +409,7 @@ static int tlshim_mgmt_rx_process(void *context, u_int8_t *data,
struct ieee80211_frame *wh;
u_int8_t mgt_type, mgt_subtype;
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("%s: Failed to get TLSHIM context", __func__);
return 0;
}
@@ -422,7 +421,7 @@ static int tlshim_mgmt_rx_process(void *context, u_int8_t *data,
}
hdr = param_tlvs->hdr;
- if (hdr == NULL) {
+ if (!hdr) {
TLSHIM_LOGE("Rx event is NULL");
return 0;
}
@@ -610,8 +609,7 @@ int tlshim_mgmt_roam_event_ind(void *context, u_int32_t vdev_id)
vos_ctx);
VOS_STATUS ret = VOS_STATUS_SUCCESS;
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("%s: Failed to get TLSHIM context", __func__);
return ret;
}
@@ -799,8 +797,7 @@ void WLANTL_RegisterVdev(void *vos_ctx, void *vdev)
tl_shim = vos_get_context(VOS_MODULE_ID_TL, vos_ctx);
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("%s: Failed to get TLSHIM context", __func__);
return;
}
@@ -825,14 +822,12 @@ adf_nbuf_t WLANTL_SendSTA_DataFrame(void *vos_ctx, u_int8_t sta_id,
struct ol_txrx_peer_t *peer;
ENTER();
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("tl_shim is NULL");
return skb;
}
- if (adf_ctx == NULL)
- {
+ if (!adf_ctx) {
TLSHIM_LOGE("adf_ct is NULL");
return skb;
}
@@ -1033,15 +1028,13 @@ VOS_STATUS WLANTL_EnableUAPSDForAC(void *vos_ctx, u_int8_t sta_id,
ENTER();
wma_handle = vos_get_context(VOS_MODULE_ID_WDA, vos_ctx);
- if (wma_handle == NULL)
- {
+ if (!wma_handle) {
TLSHIM_LOGE("wma_handle is NULL");
return VOS_STATUS_E_FAILURE;
}
tl_shim = vos_get_context(VOS_MODULE_ID_TL, vos_ctx);
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("tl_shim is NULL");
return VOS_STATUS_E_FAILURE;
}
@@ -1087,8 +1080,7 @@ VOS_STATUS WLANTL_DeRegisterMgmtFrmClient(void *vos_ctx)
tl_shim = vos_get_context(VOS_MODULE_ID_TL,
vos_ctx);
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("%s: Failed to get TLSHIM context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1096,8 +1088,7 @@ VOS_STATUS WLANTL_DeRegisterMgmtFrmClient(void *vos_ctx)
#ifdef QCA_WIFI_ISOC
txrx_pdev = vos_get_context(VOS_MODULE_ID_TXRX,
vos_ctx);
- if (txrx_pdev == NULL)
- {
+ if (!txrx_pdev) {
TLSHIM_LOGE("%s: Failed to get TXRX context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1111,8 +1102,7 @@ VOS_STATUS WLANTL_DeRegisterMgmtFrmClient(void *vos_ctx)
}
#else
wma_handle = vos_get_context(VOS_MODULE_ID_WDA, vos_ctx);
- if (wma_handle == NULL)
- {
+ if (!wma_handle) {
TLSHIM_LOGE("%s: Failed to get WMA context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1140,8 +1130,7 @@ VOS_STATUS WLANTL_RegisterMgmtFrmClient(void *vos_ctx,
#else
tp_wma_handle wma_handle = vos_get_context(VOS_MODULE_ID_WDA, vos_ctx);
#endif
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("%s: Failed to get TLSHIM context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1154,8 +1143,7 @@ VOS_STATUS WLANTL_RegisterMgmtFrmClient(void *vos_ctx,
return VOS_STATUS_E_FAILURE;
}
#else
- if (wma_handle == NULL)
- {
+ if (!wma_handle) {
TLSHIM_LOGE("%s: Failed to get WMA context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1182,8 +1170,7 @@ VOS_STATUS WLANTL_GetRssi(void *vos_ctx, u_int8_t sta_id, v_S7_t *rssi, void *pG
ENTER();
wma_handle = vos_get_context(VOS_MODULE_ID_WDA, vos_ctx);
- if (wma_handle == NULL)
- {
+ if (!wma_handle) {
TLSHIM_LOGE("wma_handle is NULL");
return VOS_STATUS_E_FAILURE;
}
@@ -1284,8 +1271,7 @@ VOS_STATUS WLANTL_ClearSTAClient(void *vos_ctx, u_int8_t sta_id)
}
tl_shim = vos_get_context(VOS_MODULE_ID_TL, vos_ctx);
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("%s: Failed to get TLSHIM context", __func__);
return VOS_STATUS_E_FAILURE;
}
@@ -1330,8 +1316,7 @@ VOS_STATUS WLANTL_RegisterSTAClient(void *vos_ctx,
return VOS_STATUS_E_FAULT;
tl_shim = vos_get_context(VOS_MODULE_ID_TL, vos_ctx);
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("tl_shim is NULL");
return VOS_STATUS_E_FAULT;
}
@@ -1384,8 +1369,7 @@ VOS_STATUS WLANTL_Close(void *vos_ctx)
ENTER();
tl_shim = vos_get_context(VOS_MODULE_ID_TL, vos_ctx);
- if (tl_shim == NULL)
- {
+ if (!tl_shim) {
TLSHIM_LOGE("tl_shim is NULL");
return VOS_STATUS_E_FAILURE;
}
diff --git a/CORE/CLD_TXRX/TXRX/ol_rx.c b/CORE/CLD_TXRX/TXRX/ol_rx.c
index aad7c3141329..10743577cff6 100644
--- a/CORE/CLD_TXRX/TXRX/ol_rx.c
+++ b/CORE/CLD_TXRX/TXRX/ol_rx.c
@@ -614,7 +614,7 @@ ol_rx_offload_deliver_ind_handler(
&tid, &fw_desc, &head_buf, &tail_buf);
peer = ol_txrx_peer_find_by_id(pdev, peer_id);
- if ((peer != NULL) && (peer->vdev != NULL)) {
+ if (peer && peer->vdev) {
vdev = peer->vdev;
OL_RX_OSIF_DELIVER(vdev, peer, head_buf);
} else {
diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx.c b/CORE/CLD_TXRX/TXRX/ol_txrx.c
index a0c51464568c..268bfc81bad1 100644
--- a/CORE/CLD_TXRX/TXRX/ol_txrx.c
+++ b/CORE/CLD_TXRX/TXRX/ol_txrx.c
@@ -1182,7 +1182,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev,
struct ol_txrx_peer_t *peer;
peer = ol_txrx_peer_find_hash_find(vdev->pdev, peer_mac, 0, 1);
- if (NULL == peer)
+ if (!peer)
{
TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "%s: peer is null", __FUNCTION__);
return;
@@ -1269,7 +1269,7 @@ ol_txrx_peer_uapsdmask_get(struct ol_txrx_pdev_t *txrx_pdev, u_int16_t peer_id)
struct ol_txrx_peer_t *peer;
peer = ol_txrx_peer_find_by_id(txrx_pdev, peer_id);
- if (peer != NULL) {
+ if (!peer) {
return peer->uapsd_mask;
}
diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx_event.c b/CORE/CLD_TXRX/TXRX/ol_txrx_event.c
index 37ffa1cf8847..56f562d285ca 100644
--- a/CORE/CLD_TXRX/TXRX/ol_txrx_event.c
+++ b/CORE/CLD_TXRX/TXRX/ol_txrx_event.c
@@ -208,7 +208,7 @@ wdi_event_detach(struct ol_txrx_pdev_t *txrx_pdev)
}
for (i = 0; i < WDI_NUM_EVENTS; i++) {
wdi_sub = txrx_pdev->wdi_event_list[i];
- if (wdi_sub != NULL) {
+ if (wdi_sub) {
/* Delete all the subscribers */
wdi_event_del_subs(wdi_sub, i);
}