diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index 3b729edaea..7fe6e7d9a2 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -298,7 +298,7 @@ htt_htc_pkt_alloc(struct htt_soc *soc) } HTT_TX_MUTEX_RELEASE(&soc->htt_tx_mutex); - if (pkt == NULL) + if (!pkt) pkt = qdf_mem_malloc(sizeof(*pkt)); return &pkt->u.pkt; /* not actually a dereference */ } @@ -498,7 +498,7 @@ dp_htt_h2t_send_complete(void *context, HTC_PACKET *htc_pkt) * adf sendcomplete is required for windows only */ /* qdf_nbuf_set_sendcompleteflag(netbuf, TRUE); */ - if (send_complete_part2 != NULL) { + if (send_complete_part2) { send_complete_part2( htt_pkt->soc_ctxt, htc_pkt->Status, netbuf); } diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 67f8899c53..871ffa494d 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -1442,7 +1442,7 @@ static uint32_t dp_service_srngs(void *dp_ctx, uint32_t dp_budget) /* Process LMAC interrupts */ for (ring = 0 ; ring < MAX_PDEV_CNT; ring++) { pdev = soc->pdev_list[ring]; - if (pdev == NULL) + if (!pdev) continue; for (mac_id = 0; mac_id < NUM_RXDMA_RINGS_PER_PDEV; mac_id++) { int mac_for_pdev = dp_get_mac_id_for_pdev(mac_id, @@ -2059,7 +2059,7 @@ static int dp_hw_link_desc_pool_setup(struct dp_soc *soc) buf_size, baseaddr); } - if (soc->wbm_idle_scatter_buf_base_vaddr[i] == NULL) { + if (!soc->wbm_idle_scatter_buf_base_vaddr[i]) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, FL("Scatter lst memory alloc fail")); @@ -4240,7 +4240,7 @@ static QDF_STATUS dp_rxdma_ring_config(struct dp_soc *soc) for (i = 0; i < MAX_PDEV_CNT; i++) { struct dp_pdev *pdev = soc->pdev_list[i]; - if (pdev == NULL) + if (!pdev) continue; for (mac_id = 0; mac_id < NUM_RXDMA_RINGS_PER_PDEV; mac_id++) { @@ -5355,7 +5355,7 @@ static void dp_peer_authorize(struct cdp_peer *peer_handle, uint32_t authorize) struct dp_peer *peer = (struct dp_peer *)peer_handle; struct dp_soc *soc; - if (peer != NULL) { + if (peer) { soc = peer->vdev->pdev->soc; qdf_spin_lock_bh(&soc->peer_ref_mutex); peer->authorize = authorize ? 1 : 0; diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index 72886fc9f4..026d6c16aa 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -1739,7 +1739,7 @@ int dp_rx_tid_setup_wifi3(struct dp_peer *peer, int tid, return QDF_STATUS_E_FAILURE; rx_tid->ba_win_size = ba_window_size; - if (rx_tid->hw_qdesc_vaddr_unaligned != NULL) + if (rx_tid->hw_qdesc_vaddr_unaligned) return dp_rx_tid_update_wifi3(peer, tid, ba_window_size, start_seq); rx_tid->delba_tx_status = 0; @@ -1874,7 +1874,7 @@ try_desc_alloc: } return 0; error: - if (NULL != rx_tid->hw_qdesc_vaddr_unaligned) { + if (rx_tid->hw_qdesc_vaddr_unaligned) { if (dp_reo_desc_addr_chk(rx_tid->hw_qdesc_paddr) == QDF_STATUS_SUCCESS) qdf_mem_unmap_nbytes_single( @@ -2637,7 +2637,7 @@ dp_set_pn_check_wifi3(struct cdp_vdev *vdev_handle, struct cdp_peer *peer_handle for (i = 0; i < DP_MAX_TIDS; i++) { struct dp_rx_tid *rx_tid = &peer->rx_tid[i]; qdf_spin_lock_bh(&rx_tid->tid_lock); - if (rx_tid->hw_qdesc_vaddr_unaligned != NULL) { + if (rx_tid->hw_qdesc_vaddr_unaligned) { params.std.addr_lo = rx_tid->hw_qdesc_paddr & 0xffffffff; params.std.addr_hi = @@ -2890,7 +2890,7 @@ QDF_STATUS dp_peer_state_update(struct cdp_pdev *pdev_handle, uint8_t *peer_mac, struct dp_pdev *pdev = (struct dp_pdev *)pdev_handle; peer = dp_peer_find_hash_find(pdev->soc, peer_mac, 0, DP_VDEV_ALL); - if (NULL == peer) { + if (!peer) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "Failed to find peer for: [%pM]", peer_mac); return QDF_STATUS_E_FAILURE; @@ -3143,7 +3143,7 @@ void dp_peer_rxtid_stats(struct dp_peer *peer, void (*dp_stats_cmd_cb), qdf_mem_zero(¶ms, sizeof(params)); for (i = 0; i < DP_MAX_TIDS; i++) { struct dp_rx_tid *rx_tid = &peer->rx_tid[i]; - if (rx_tid->hw_qdesc_vaddr_unaligned != NULL) { + if (rx_tid->hw_qdesc_vaddr_unaligned) { params.std.need_status = 1; params.std.addr_lo = rx_tid->hw_qdesc_paddr & 0xffffffff; diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index 1395eccd5b..6a281bc109 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -201,7 +201,7 @@ QDF_STATUS dp_rx_buffers_replenish(struct dp_soc *dp_soc, uint32_t mac_id, RX_BUFFER_ALIGNMENT, FALSE); - if (rx_netbuf == NULL) { + if (!rx_netbuf) { DP_STATS_INC(dp_pdev, replenish.nbuf_alloc_fail, 1); continue; } @@ -578,7 +578,7 @@ void dp_rx_fill_mesh_stats(struct dp_vdev *vdev, qdf_nbuf_t nbuf, /* upper layers are resposible to free this memory */ - if (rx_info == NULL) { + if (!rx_info) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "Memory allocation failed for mesh rx stats"); DP_STATS_INC(vdev->pdev, mesh_mem_alloc, 1); @@ -900,7 +900,7 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu) qdf_spin_unlock_bh(&pdev->vdev_list_lock); } - if (NULL == vdev) { + if (!vdev) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "VDEV not found"); goto free; @@ -1672,7 +1672,7 @@ done: } /* Peer can be NULL is case of LFR */ - if (qdf_likely(peer != NULL)) + if (qdf_likely(peer)) vdev = NULL; /* @@ -1735,7 +1735,7 @@ done: deliver_list_tail = NULL; } - if (qdf_likely(peer != NULL)) { + if (qdf_likely(peer)) { vdev = peer->vdev; } else { DP_STATS_INC_PKT(soc, rx.err.rx_invalid_peer, 1, @@ -1746,7 +1746,7 @@ done: continue; } - if (qdf_unlikely(vdev == NULL)) { + if (qdf_unlikely(!vdev)) { tid_stats->fail_cnt[INVALID_PEER_VDEV]++; qdf_nbuf_free(nbuf); nbuf = next; @@ -2058,7 +2058,7 @@ dp_rx_nbuf_prepare(struct dp_soc *soc, struct dp_pdev *pdev) RX_BUFFER_ALIGNMENT, FALSE); - if (nbuf == NULL) { + if (!nbuf) { DP_STATS_INC(pdev, replenish.nbuf_alloc_fail, 1); continue; diff --git a/dp/wifi3.0/dp_rx.h b/dp/wifi3.0/dp_rx.h index 930a35c4f5..02c8145335 100644 --- a/dp/wifi3.0/dp_rx.h +++ b/dp/wifi3.0/dp_rx.h @@ -398,7 +398,7 @@ void dp_rx_add_to_free_desc_list(union dp_rx_desc_list_elem_t **head, ((union dp_rx_desc_list_elem_t *)new)->next = *head; *head = (union dp_rx_desc_list_elem_t *)new; - if (*tail == NULL) + if (!*tail) *tail = *head; } diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index 50cf865039..6d89bff506 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -355,7 +355,7 @@ static QDF_STATUS dp_rx_defrag_fraglist_insert(struct dp_peer *peer, unsigned ti cur = frag; *head_addr = frag; /* head pointer to be updated */ } else { - while ((cur_fragno > head_fragno) && cur != NULL) { + while ((cur_fragno > head_fragno) && cur) { prev = cur; cur = qdf_nbuf_next(cur); rx_desc_info = qdf_nbuf_data(cur); @@ -670,7 +670,7 @@ static QDF_STATUS dp_rx_defrag_mic(const uint8_t *key, qdf_nbuf_t wbuf, break; wbuf = qdf_nbuf_next(wbuf); - if (wbuf == NULL) + if (!wbuf) return QDF_STATUS_E_DEFRAG_ERROR; if (space != 0) { @@ -895,7 +895,7 @@ dp_rx_defrag_nwifi_to_8023(qdf_nbuf_t nbuf, uint16_t hdrsize) union dp_align_mac_addr mac_addr; uint8_t *rx_desc_info = qdf_mem_malloc(RX_PKT_TLVS_LEN); - if (rx_desc_info == NULL) { + if (!rx_desc_info) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "%s: Memory alloc failed ! ", __func__); QDF_ASSERT(0); @@ -1341,7 +1341,7 @@ static QDF_STATUS dp_rx_defrag_save_info_from_ring_desc(void *ring_desc, void *dst_ring_desc = qdf_mem_malloc( sizeof(struct reo_destination_ring)); - if (dst_ring_desc == NULL) { + if (!dst_ring_desc) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "%s: Memory alloc failed !", __func__); QDF_ASSERT(0); diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index 3156c080f2..40c228acf1 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -534,7 +534,7 @@ dp_2k_jump_handle(struct dp_soc *soc, goto free_nbuf; } rx_tid = &peer->rx_tid[tid]; - if (qdf_unlikely(rx_tid == NULL)) { + if (qdf_unlikely(!rx_tid)) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "rx_tid is NULL!!"); goto free_nbuf; diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index 0cba72539b..8e97108263 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/dp/wifi3.0/dp_rx_mon_dest.c @@ -472,7 +472,7 @@ dp_rx_mon_mpdu_pop(struct dp_soc *soc, uint32_t mac_id, qdf_nbuf_data(msdu), (uint32_t)qdf_nbuf_len(msdu)); - if (head_msdu && *head_msdu == NULL) { + if (head_msdu && !*head_msdu) { *head_msdu = msdu; } else { if (last) @@ -1103,7 +1103,7 @@ void dp_rx_mon_dest_process(struct dp_soc *soc, uint32_t mac_id, uint32_t quota) break; } - if (qdf_likely((head_msdu != NULL) && (tail_msdu != NULL))) { + if (qdf_likely((head_msdu) && (tail_msdu))) { rx_mon_stats->dest_mpdu_done++; dp_rx_mon_deliver(soc, mac_id, head_msdu, tail_msdu); } diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 7ea3dd9e53..38dbf7af82 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -282,7 +282,7 @@ dp_rx_handle_mcopy_mode(struct dp_soc *soc, struct dp_pdev *pdev, struct ieee80211_frame *wh; uint32_t *nbuf_data; - if (ppdu_info->msdu_info.first_msdu_payload == NULL) + if (!ppdu_info->msdu_info.first_msdu_payload) return QDF_STATUS_SUCCESS; if (pdev->m_copy_id.rx_ppdu_id == ppdu_info->com_info.ppdu_id) @@ -346,7 +346,7 @@ dp_rx_handle_smart_mesh_mode(struct dp_soc *soc, struct dp_pdev *pdev, __func__, __LINE__); return 1; } - if (ppdu_info->msdu_info.first_msdu_payload == NULL) { + if (!ppdu_info->msdu_info.first_msdu_payload) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "[%s]:[%d] First msdu payload not present", __func__, __LINE__); @@ -542,7 +542,7 @@ dp_rx_mon_status_process_tlv(struct dp_soc *soc, uint32_t mac_id, rx_tlv = qdf_nbuf_data(status_nbuf); rx_tlv_start = rx_tlv; - if ((pdev->monitor_vdev != NULL) || (pdev->enhanced_stats_en) || + if ((pdev->monitor_vdev) || (pdev->enhanced_stats_en) || pdev->mcopy_mode) { do { @@ -742,7 +742,7 @@ dp_rx_mon_status_srng_process(struct dp_soc *soc, uint32_t mac_id, * wait next time dp_rx_mon_status_srng_process * to fill in buffer at current HP. */ - if (qdf_unlikely(status_nbuf == NULL)) { + if (qdf_unlikely(!status_nbuf)) { union dp_rx_desc_list_elem_t *desc_list = NULL; union dp_rx_desc_list_elem_t *tail = NULL; struct rx_desc_pool *rx_desc_pool; @@ -941,7 +941,7 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, * wait dp_rx_mon_status_srng_process * to fill in buffer at current HP. */ - if (qdf_unlikely(rx_netbuf == NULL)) { + if (qdf_unlikely(!rx_netbuf)) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "%s: qdf_nbuf allocate or map fail, count %d", __func__, count); @@ -954,7 +954,7 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, rxdma_ring_entry = hal_srng_src_get_next(dp_soc->hal_soc, rxdma_srng); - if (qdf_unlikely(rxdma_ring_entry == NULL)) { + if (qdf_unlikely(!rxdma_ring_entry)) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "[%s][%d] rxdma_ring_entry is NULL, count - %d", __func__, __LINE__, count); diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 942eb45fee..3f51338b69 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -286,7 +286,7 @@ static uint8_t dp_tx_prepare_htt_metadata(struct dp_vdev *vdev, qdf_nbuf_t nbuf, } /* Fill and add HTT metaheader */ hdr = qdf_nbuf_push_head(nbuf, htt_desc_size_aligned); - if (hdr == NULL) { + if (!hdr) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "Error in filling HTT metadata"); @@ -1185,12 +1185,12 @@ static bool dp_cce_classify(struct dp_vdev *vdev, qdf_nbuf_t nbuf) && qdf_nbuf_is_ipv4_dhcp_pkt(nbuf)) || (qdf_nbuf_is_ipv6_pkt(nbuf) && qdf_nbuf_is_ipv6_dhcp_pkt(nbuf)))) { - if (qdf_unlikely(nbuf_clone != NULL)) + if (qdf_unlikely(nbuf_clone)) qdf_nbuf_free(nbuf_clone); return true; } - if (qdf_unlikely(nbuf_clone != NULL)) + if (qdf_unlikely(nbuf_clone)) qdf_nbuf_free(nbuf_clone); return false; @@ -1897,7 +1897,7 @@ static qdf_nbuf_t dp_tx_prepare_nawds(struct dp_vdev *vdev, qdf_nbuf_t nbuf, peer_id = peer->peer_ids[0]; nbuf_copy = dp_tx_send_msdu_single(vdev, nbuf_copy, msdu_info, peer_id, NULL); - if (nbuf_copy != NULL) { + if (nbuf_copy) { qdf_nbuf_free(nbuf_copy); continue; } @@ -2046,7 +2046,7 @@ qdf_nbuf_t dp_tx_send_mesh(void *vap_dev, qdf_nbuf_t nbuf) uint8_t no_enc_frame = 0; nbuf_mesh = qdf_nbuf_unshare(nbuf); - if (nbuf_mesh == NULL) { + if (!nbuf_mesh) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "qdf_nbuf_unshare failed"); return nbuf; @@ -2065,7 +2065,7 @@ qdf_nbuf_t dp_tx_send_mesh(void *vap_dev, qdf_nbuf_t nbuf) if ((mhdr->flags & METAHDR_FLAG_INFO_UPDATED) && !no_enc_frame) { nbuf_clone = qdf_nbuf_clone(nbuf); - if (nbuf_clone == NULL) { + if (!nbuf_clone) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "qdf_nbuf_clone failed"); return nbuf; @@ -2087,7 +2087,7 @@ qdf_nbuf_t dp_tx_send_mesh(void *vap_dev, qdf_nbuf_t nbuf) qdf_nbuf_set_tx_ftype(nbuf, CB_FTYPE_INVALID); nbuf = dp_tx_send(vap_dev, nbuf); - if ((nbuf == NULL) && no_enc_frame) { + if ((!nbuf) && no_enc_frame) { DP_STATS_INC(vdev, tx_i.mesh.exception_fw, 1); } @@ -2141,7 +2141,7 @@ qdf_nbuf_t dp_tx_send(void *vap_dev, qdf_nbuf_t nbuf) if (qdf_unlikely(vdev->mesh_vdev)) { nbuf_mesh = dp_tx_extract_mesh_meta_data(vdev, nbuf, &msdu_info); - if (nbuf_mesh == NULL) { + if (!nbuf_mesh) { dp_verbose_debug("Extracting mesh metadata failed"); return nbuf; } @@ -2228,7 +2228,7 @@ qdf_nbuf_t dp_tx_send(void *vap_dev, qdf_nbuf_t nbuf) /* RAW */ if (qdf_unlikely(vdev->tx_encap_type == htt_cmn_pkt_type_raw)) { nbuf = dp_tx_prepare_raw(vdev, nbuf, &seg_info, &msdu_info); - if (nbuf == NULL) + if (!nbuf) return NULL; dp_verbose_debug("Raw frame %pK", vdev); @@ -4148,7 +4148,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, } mc_uc_buf = dp_tx_me_alloc_buf(pdev); - if (mc_uc_buf == NULL) + if (!mc_uc_buf) goto fail_buf_alloc; /* @@ -4157,7 +4157,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, */ if (new_mac_idx < (new_mac_cnt - 1)) { nbuf_clone = qdf_nbuf_clone((qdf_nbuf_t)nbuf); - if (nbuf_clone == NULL) { + if (!nbuf_clone) { DP_STATS_INC(vdev, tx_i.mcast_en.clone_fail, 1); goto fail_clone; } @@ -4196,7 +4196,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, seg_info_new->next = NULL; - if (seg_info_head == NULL) + if (!seg_info_head) seg_info_head = seg_info_new; else seg_info_tail->next = seg_info_new; diff --git a/dp/wifi3.0/dp_tx_flow_control.c b/dp/wifi3.0/dp_tx_flow_control.c index eed23c6a0d..af8eb98668 100644 --- a/dp/wifi3.0/dp_tx_flow_control.c +++ b/dp/wifi3.0/dp_tx_flow_control.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -431,7 +431,7 @@ QDF_STATUS dp_tx_flow_pool_map_handler(struct dp_pdev *pdev, uint8_t flow_id, pool = dp_tx_create_flow_pool(soc, flow_pool_id, flow_pool_size); - if (pool == NULL) { + if (!pool) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "%s: creation of flow_pool %d size %d failed", __func__, flow_pool_id, flow_pool_size); diff --git a/dp/wifi3.0/dp_tx_me.c b/dp/wifi3.0/dp_tx_me.c index 5e164848f6..7513362dc7 100644 --- a/dp/wifi3.0/dp_tx_me.c +++ b/dp/wifi3.0/dp_tx_me.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -52,10 +52,10 @@ dp_tx_me_init(struct dp_pdev *pdev) /* Add flow control buffer count */ pool_size = (mc_uc_buf_len) * num_pool_elems; pdev->me_buf.size = mc_uc_buf_len; - if (pdev->me_buf.vaddr == NULL) { + if (!pdev->me_buf.vaddr) { qdf_spin_lock_bh(&pdev->tx_mutex); pdev->me_buf.vaddr = qdf_mem_malloc(pool_size); - if (pdev->me_buf.vaddr == NULL) { + if (!pdev->me_buf.vaddr) { qdf_spin_unlock_bh(&pdev->tx_mutex); QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, "Error allocating memory pool");