diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index b00033360f..062735fd0e 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -984,8 +984,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 	tsinfo = delts.wmeTspecPresent ? &delts.tspec.tsinfo : &delts.tsinfo;
 
 	/* if no Admit Control, ignore the request */
-	if ((tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA)) {
-
+	if (tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA) {
 		if (upToAc(tsinfo->traffic.userPrio) >= MAX_NUM_AC) {
 			pe_warn("DelTs with UP: %d has no AC - ignoring req",
 				tsinfo->traffic.userPrio);
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 2220be250e..957e871600 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -532,17 +532,18 @@ tpPESession pe_find_session_by_bss_idx(tpAniSirGlobal pMac, uint8_t bssIdx)
 
    \sa
    --------------------------------------------------------------------------*/
-tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac, uint8_t sessionId)
+tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac,
+					  uint8_t sessionId)
 {
 	if (sessionId >= pMac->lim.maxBssId) {
 		pe_err("Invalid sessionId: %d", sessionId);
 		return NULL;
 	}
-	if ((pMac->lim.gpSession[sessionId].valid == true)) {
-		return &pMac->lim.gpSession[sessionId];
-	}
-	return NULL;
 
+	if (pMac->lim.gpSession[sessionId].valid)
+		return &pMac->lim.gpSession[sessionId];
+
+	return NULL;
 }
 
 /**
diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c
index aa629af4a8..bd8f1d82e1 100644
--- a/core/mac/src/pe/rrm/rrm_api.c
+++ b/core/mac/src/pe/rrm/rrm_api.c
@@ -211,7 +211,7 @@ tSirRetStatus rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac,
 
 	if (qdf_is_macaddr_broadcast(&pMaxTxParams->bssId)) {
 		for (i = 0; i < pMac->lim.maxBssId; i++) {
-			if ((pMac->lim.gpSession[i].valid == true)) {
+			if (pMac->lim.gpSession[i].valid == true) {
 				pSessionEntry = &pMac->lim.gpSession[i];
 				rrm_cache_mgmt_tx_power(pMac, pMaxTxParams->power,
 							pSessionEntry);
diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c
index d51cb94e6e..7f668ddce7 100644
--- a/core/mac/src/pe/sch/sch_beacon_gen.c
+++ b/core/mac/src/pe/sch/sch_beacon_gen.c
@@ -437,7 +437,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
 		}
 	}
 
-	if ((LIM_IS_AP_ROLE(session))) {
+	if (LIM_IS_AP_ROLE(session)) {
 		/*
 		 * Can be efficiently updated whenever new IE added  in Probe
 		 * response in future
diff --git a/core/sap/dfs/src/dfs_bindetects.c b/core/sap/dfs/src/dfs_bindetects.c
index dc3acf6dab..2c3b799ddb 100644
--- a/core/sap/dfs/src/dfs_bindetects.c
+++ b/core/sap/dfs/src/dfs_bindetects.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2002-2014, 2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -458,7 +458,7 @@ dfs_bin_pri_check(struct ath_dfs *dfs, struct dfs_filter *rf,
 		}
 
 		if (primatch && (deltadur < durmargin)) {
-			if ((numpulses == 1)) {
+			if (numpulses == 1) {
 				numpulses++;
 			} else {
 				delta_time_stamps =
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 6b926c6936..cd5331f6a7 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -4110,8 +4110,8 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 
 #ifdef FEATURE_WLAN_CH_AVOID
 		for (i = 0; i < NUM_CHANNELS; i++) {
-			if ((safe_channels[i].channelNumber ==
-			     WLAN_REG_CH_NUM(loop_count))) {
+			if (safe_channels[i].channelNumber ==
+			     WLAN_REG_CH_NUM(loop_count)) {
 				/* Check if channel is safe */
 				if (true == safe_channels[i].isSafe) {
 #endif
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index f198092b2b..834baff2fe 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -20083,8 +20083,8 @@ static QDF_STATUS csr_process_roam_sync_callback(tpAniSirGlobal mac_ctx,
 	 *      with AP after this point and sends new keys to the driver.
 	 *      Driver starts wait_for_key timer for that purpose.
 	 */
-	if ((roam_synch_data->authStatus
-				== CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) {
+	if (roam_synch_data->authStatus
+				== CSR_ROAM_AUTH_STATUS_AUTHENTICATED) {
 		QDF_TRACE(QDF_MODULE_ID_SME,
 				QDF_TRACE_LEVEL_DEBUG,
 				FL("LFR3:Don't start waitforkey timer"));
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index cc2718de2c..03b38d9ef1 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -3828,7 +3828,7 @@ static bool csr_scan_filter_given_chnl_band(tpAniSirGlobal mac_ctx,
 	 * In case if no-concurrent IBSS session exist then scan
 	 * full band
 	 */
-	if ((dst_req->ChannelInfo.numOfChannels == 0)) {
+	if (dst_req->ChannelInfo.numOfChannels == 0) {
 		csr_get_cfg_valid_channels(mac_ctx, valid_chnl_list,
 				&valid_chnl_len);
 	} else {