Browse Source

qcacmn: dfs: Replace explicit comparison to NULL

Per the Linux Kernel coding style, as enforced by the kernel
checkpatch script, pointers should not be explicitly compared to
NULL. Therefore within umac dfs replace any such comparisons with
logical operations performed on the pointer itself.

Change-Id: Ib67c0ebda22f93a353f8f3f1be1e1ab10b15db4a
CRs-Fixed: 2420151
Jeff Johnson 6 years ago
parent
commit
cba07b4883

+ 2 - 2
umac/dfs/core/src/filtering/dfs_debug.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013, 2016-2019 The Linux Foundation. All rights reserved.
  * Copyright (c) 2002-2010, Atheros Communications Inc.
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -82,7 +82,7 @@ void dfs_print_filters(struct wlan_dfs *dfs)
 	}
 
 	for (i = 0; i < DFS_MAX_RADAR_TYPES; i++) {
-		if (dfs->dfs_radarf[i] != NULL) {
+		if (dfs->dfs_radarf[i]) {
 			ft = dfs->dfs_radarf[i];
 			if ((ft->ft_numfilters > DFS_MAX_NUM_RADAR_FILTERS) ||
 					(!ft->ft_numfilters)) {

+ 2 - 2
umac/dfs/core/src/filtering/dfs_init.c

@@ -40,7 +40,7 @@ static inline void dfs_reset_filtertype(
 	for (j = 0; j < ft->ft_numfilters; j++) {
 		rf = ft->ft_filters[j];
 		dl = &(rf->rf_dl);
-		if (dl != NULL) {
+		if (dl) {
 			qdf_mem_zero(dl, sizeof(*dl));
 			dl->dl_lastelem = (0xFFFFFFFF) & DFS_MAX_DL_MASK;
 		}
@@ -69,7 +69,7 @@ void dfs_reset_alldelaylines(struct wlan_dfs *dfs)
 	pl->pl_lastelem = DFS_MAX_PULSE_BUFFER_MASK;
 
 	for (i = 0; i < DFS_MAX_RADAR_TYPES; i++) {
-		if (dfs->dfs_radarf[i] != NULL) {
+		if (dfs->dfs_radarf[i]) {
 			ft = dfs->dfs_radarf[i];
 			dfs_reset_filtertype(ft);
 		}

+ 2 - 2
umac/dfs/core/src/filtering/dfs_process_radarevent.c

@@ -460,7 +460,7 @@ void __dfs_process_radarevent(struct wlan_dfs *dfs,
 		dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS,
 				"Found on channel minDur = %d, filterId = %d",
 				ft->ft_mindur,
-				rf != NULL ?  rf->rf_pulseid : -1);
+				rf ?  rf->rf_pulseid : -1);
 	}
 
 	return;
@@ -709,7 +709,7 @@ static inline void dfs_remove_event_from_radarq(
 {
 	WLAN_DFSQ_LOCK(dfs);
 	*event = STAILQ_FIRST(&(dfs->dfs_radarq));
-	if (*event != NULL)
+	if (*event)
 		STAILQ_REMOVE_HEAD(&(dfs->dfs_radarq), re_list);
 	WLAN_DFSQ_UNLOCK(dfs);
 }

+ 5 - 5
umac/dfs/core/src/filtering/dfs_radar.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  * Copyright (c) 2011, Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -103,7 +103,7 @@ struct dfs_state *dfs_getchanstate(struct wlan_dfs *dfs, uint8_t *index,
 				(dfs->dfs_radar[i].rs_chan.dfs_ch_flags ==
 				 cmp_ch->dfs_ch_flags)
 		   ) {
-			if (index != NULL)
+			if (index)
 				*index = (uint8_t)i;
 			return &(dfs->dfs_radar[i]);
 		}
@@ -119,7 +119,7 @@ struct dfs_state *dfs_getchanstate(struct wlan_dfs *dfs, uint8_t *index,
 			dfs_phyerr_param_copy(&rs->rs_param,
 					&dfs->dfs_defaultparams);
 
-			if (index != NULL)
+			if (index)
 				*index = (uint8_t)i;
 
 			return rs;
@@ -179,8 +179,8 @@ void dfs_radar_enable(struct wlan_dfs *dfs, int no_cac, uint32_t opmode)
 		if (err == QDF_STATUS_SUCCESS)
 			rs_ext = dfs_getchanstate(dfs, &index_ext, 1);
 
-		if (rs_pri != NULL && ((err == QDF_STATUS_E_FAILURE) ||
-					(rs_ext != NULL))) {
+		if (rs_pri && ((err == QDF_STATUS_E_FAILURE) ||
+					(rs_ext))) {
 			struct wlan_dfs_phyerr_param pe;
 
 			qdf_mem_set(&pe, sizeof(pe), '\0');

+ 7 - 7
umac/dfs/core/src/misc/dfs_filter_init.c

@@ -311,7 +311,7 @@ bad2:
 	dfs->dfs_ftindextable = NULL;
 bad1:
 	for (n = 0; n < DFS_MAX_RADAR_TYPES; n++) {
-		if (dfs->dfs_radarf[n] != NULL) {
+		if (dfs->dfs_radarf[n]) {
 			dfs_free_filter(dfs->dfs_radarf[n]);
 			qdf_mem_free(dfs->dfs_radarf[n]);
 			dfs->dfs_radarf[n] = NULL;
@@ -364,22 +364,22 @@ void dfs_main_detach(struct wlan_dfs *dfs)
 	dfs_reset_radarq(dfs);
 	dfs_reset_alldelaylines(dfs);
 
-	if (dfs->pulses != NULL) {
+	if (dfs->pulses) {
 		dfs_free_dfs_pulseline(dfs->pulses);
 		dfs->pulses = NULL;
 	}
 
 	for (n = 0; n < DFS_MAX_RADAR_TYPES; n++) {
-		if (dfs->dfs_radarf[n] != NULL) {
+		if (dfs->dfs_radarf[n]) {
 			dfs_free_filter(dfs->dfs_radarf[n]);
 			qdf_mem_free(dfs->dfs_radarf[n]);
 			dfs->dfs_radarf[n] = NULL;
 		}
 	}
 
-	if (dfs->dfs_ftindextable != NULL) {
+	if (dfs->dfs_ftindextable) {
 		for (n = 0; n < DFS_NUM_FT_IDX_TBL_ROWS; n++) {
-			if (dfs->dfs_ftindextable[n] != NULL) {
+			if (dfs->dfs_ftindextable[n]) {
 				qdf_mem_free(dfs->dfs_ftindextable[n]);
 				dfs->dfs_ftindextable[n] = NULL;
 			}
@@ -389,7 +389,7 @@ void dfs_main_detach(struct wlan_dfs *dfs)
 		dfs->wlan_dfs_isdfsregdomain = 0;
 	}
 
-	if (dfs->dfs_b5radars != NULL) {
+	if (dfs->dfs_b5radars) {
 		qdf_mem_free(dfs->dfs_b5radars);
 		dfs->dfs_b5radars = NULL;
 	}
@@ -402,7 +402,7 @@ void dfs_main_detach(struct wlan_dfs *dfs)
 	if (!empty)
 		dfs_reset_arq(dfs);
 
-	if (dfs->events != NULL) {
+	if (dfs->events) {
 		dfs_free_dfs_events(dfs->events);
 		dfs->events = NULL;
 	}

+ 4 - 4
umac/dfs/core/src/misc/dfs_nol.c

@@ -192,7 +192,7 @@ static void dfs_nol_delete(struct wlan_dfs *dfs,
 		 delfreq, delchwidth);
 	prev_next = &(dfs->dfs_nol);
 	nol = dfs->dfs_nol;
-	while (nol != NULL) {
+	while (nol) {
 		if (nol->nol_freq == delfreq &&
 			nol->nol_chwidth == delchwidth) {
 			*prev_next = nol->nol_next;
@@ -269,7 +269,7 @@ void dfs_print_nol(struct wlan_dfs *dfs)
 
 	nol = dfs->dfs_nol;
 	dfs_debug(dfs, WLAN_DEBUG_DFS_NOL, "NOL");
-	while (nol != NULL) {
+	while (nol) {
 		diff_ms = qdf_system_ticks_to_msecs(qdf_system_ticks() -
 				nol->nol_start_ticks);
 		diff_ms = (nol->nol_timeout_ms - diff_ms);
@@ -331,7 +331,7 @@ void dfs_get_nol(struct wlan_dfs *dfs,
 	}
 
 	nol = dfs->dfs_nol;
-	while (nol != NULL) {
+	while (nol) {
 		dfs_nol[*nchan].nol_freq = nol->nol_freq;
 		dfs_nol[*nchan].nol_chwidth = nol->nol_chwidth;
 		dfs_nol[*nchan].nol_start_ticks = nol->nol_start_ticks;
@@ -396,7 +396,7 @@ void dfs_nol_addchan(struct wlan_dfs *dfs,
 	nol = dfs->dfs_nol;
 	prev = dfs->dfs_nol;
 	elem = NULL;
-	while (nol != NULL) {
+	while (nol) {
 		if ((nol->nol_freq == freq) &&
 				(nol->nol_chwidth == ch_width)) {
 			nol->nol_start_ticks = qdf_system_ticks();

+ 1 - 1
umac/dfs/core/src/misc/dfs_random_chan_sel.c

@@ -764,7 +764,7 @@ dfs_find_target_channel_in_channel_matrix(enum phy_ch_width ch_width,
 		}
 	}
 
-	if (NULL == target_chan_matrix) {
+	if (!target_chan_matrix) {
 		return false;
 	} else {
 		*pTarget_chnl_mtrx = target_chan_matrix;

+ 15 - 15
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c

@@ -34,7 +34,7 @@
 void dfs_mlme_start_rcsa(struct wlan_objmgr_pdev *pdev,
 		bool *wait_for_csa)
 {
-	if (global_dfs_to_mlme.dfs_start_rcsa != NULL)
+	if (global_dfs_to_mlme.dfs_start_rcsa)
 		global_dfs_to_mlme.dfs_start_rcsa(pdev, wait_for_csa);
 }
 
@@ -45,7 +45,7 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
 		uint8_t vhtop_ch_freq_seg2,
 		uint64_t flags)
 {
-	if (global_dfs_to_mlme.mlme_mark_dfs != NULL)
+	if (global_dfs_to_mlme.mlme_mark_dfs)
 		global_dfs_to_mlme.mlme_mark_dfs(pdev,
 				ieee,
 				freq,
@@ -93,7 +93,7 @@ void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
 		uint8_t ieee_chan, uint16_t freq,
 		uint8_t cfreq2, uint64_t flags)
 {
-	if (global_dfs_to_mlme.mlme_start_csa != NULL)
+	if (global_dfs_to_mlme.mlme_start_csa)
 		global_dfs_to_mlme.mlme_start_csa(pdev, ieee_chan, freq, cfreq2,
 				flags);
 }
@@ -117,7 +117,7 @@ void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
 #ifndef QCA_MCL_DFS_SUPPORT
 void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id)
 {
-	if (global_dfs_to_mlme.mlme_proc_cac != NULL)
+	if (global_dfs_to_mlme.mlme_proc_cac)
 		global_dfs_to_mlme.mlme_proc_cac(pdev);
 }
 #else
@@ -146,7 +146,7 @@ void dfs_mlme_deliver_event_up_after_cac(struct wlan_objmgr_pdev *pdev)
 void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev,
 		int *nchans)
 {
-	if (global_dfs_to_mlme.mlme_get_dfs_ch_nchans != NULL)
+	if (global_dfs_to_mlme.mlme_get_dfs_ch_nchans)
 		global_dfs_to_mlme.mlme_get_dfs_ch_nchans(pdev,
 				nchans);
 }
@@ -159,7 +159,7 @@ QDF_STATUS dfs_mlme_get_extchan(struct wlan_objmgr_pdev *pdev,
 		uint8_t *dfs_ch_vhtop_ch_freq_seg1,
 		uint8_t *dfs_ch_vhtop_ch_freq_seg2)
 {
-	if (global_dfs_to_mlme.mlme_get_extchan != NULL)
+	if (global_dfs_to_mlme.mlme_get_extchan)
 		return global_dfs_to_mlme.mlme_get_extchan(pdev,
 				dfs_ch_freq,
 				dfs_ch_flags,
@@ -174,7 +174,7 @@ QDF_STATUS dfs_mlme_get_extchan(struct wlan_objmgr_pdev *pdev,
 void dfs_mlme_set_no_chans_available(struct wlan_objmgr_pdev *pdev,
 		int val)
 {
-	if (global_dfs_to_mlme.mlme_set_no_chans_available != NULL)
+	if (global_dfs_to_mlme.mlme_set_no_chans_available)
 		global_dfs_to_mlme.mlme_set_no_chans_available(
 				pdev,
 				val);
@@ -184,7 +184,7 @@ int dfs_mlme_ieee2mhz(struct wlan_objmgr_pdev *pdev, int ieee, uint64_t flag)
 {
 	int freq = 0;
 
-	if (global_dfs_to_mlme.mlme_ieee2mhz != NULL)
+	if (global_dfs_to_mlme.mlme_ieee2mhz)
 		global_dfs_to_mlme.mlme_ieee2mhz(pdev,
 				ieee,
 				flag,
@@ -205,7 +205,7 @@ dfs_mlme_find_dot11_channel(struct wlan_objmgr_pdev *pdev,
 			    uint8_t *dfs_ch_vhtop_ch_freq_seg1,
 			    uint8_t *dfs_ch_vhtop_ch_freq_seg2)
 {
-	if (global_dfs_to_mlme.mlme_find_dot11_channel != NULL)
+	if (global_dfs_to_mlme.mlme_find_dot11_channel)
 		return global_dfs_to_mlme.mlme_find_dot11_channel(pdev,
 								  ieee,
 								  des_cfreq2,
@@ -228,7 +228,7 @@ void dfs_mlme_get_dfs_ch_channels(struct wlan_objmgr_pdev *pdev,
 		uint8_t *dfs_ch_vhtop_ch_freq_seg2,
 		int index)
 {
-	if (global_dfs_to_mlme.mlme_get_dfs_ch_channels != NULL)
+	if (global_dfs_to_mlme.mlme_get_dfs_ch_channels)
 		global_dfs_to_mlme.mlme_get_dfs_ch_channels(pdev,
 				dfs_ch_freq,
 				dfs_ch_flags,
@@ -243,7 +243,7 @@ uint32_t dfs_mlme_dfs_ch_flags_ext(struct wlan_objmgr_pdev *pdev)
 {
 	uint16_t flag_ext = 0;
 
-	if (global_dfs_to_mlme.mlme_dfs_ch_flags_ext != NULL)
+	if (global_dfs_to_mlme.mlme_dfs_ch_flags_ext)
 		global_dfs_to_mlme.mlme_dfs_ch_flags_ext(pdev,
 				&flag_ext);
 
@@ -252,14 +252,14 @@ uint32_t dfs_mlme_dfs_ch_flags_ext(struct wlan_objmgr_pdev *pdev)
 
 void dfs_mlme_channel_change_by_precac(struct wlan_objmgr_pdev *pdev)
 {
-	if (global_dfs_to_mlme.mlme_channel_change_by_precac != NULL)
+	if (global_dfs_to_mlme.mlme_channel_change_by_precac)
 		global_dfs_to_mlme.mlme_channel_change_by_precac(
 				pdev);
 }
 
 void dfs_mlme_nol_timeout_notification(struct wlan_objmgr_pdev *pdev)
 {
-	if (global_dfs_to_mlme.mlme_nol_timeout_notification != NULL)
+	if (global_dfs_to_mlme.mlme_nol_timeout_notification)
 		global_dfs_to_mlme.mlme_nol_timeout_notification(
 				pdev);
 }
@@ -268,7 +268,7 @@ void dfs_mlme_clist_update(struct wlan_objmgr_pdev *pdev,
 		void *nollist,
 		int nentries)
 {
-	if (global_dfs_to_mlme.mlme_clist_update != NULL)
+	if (global_dfs_to_mlme.mlme_clist_update)
 		global_dfs_to_mlme.mlme_clist_update(pdev,
 				nollist,
 				nentries);
@@ -281,7 +281,7 @@ int dfs_mlme_get_cac_timeout(struct wlan_objmgr_pdev *pdev,
 {
 	int cac_timeout = 0;
 
-	if (global_dfs_to_mlme.mlme_get_cac_timeout != NULL)
+	if (global_dfs_to_mlme.mlme_get_cac_timeout)
 		global_dfs_to_mlme.mlme_get_cac_timeout(pdev,
 				dfs_ch_freq,
 				dfs_ch_vhtop_ch_freq_seg2,