diff --git a/components/pmo/core/src/wlan_pmo_gtk.c b/components/pmo/core/src/wlan_pmo_gtk.c
index 28f80f8a0c..30a8ffd996 100644
--- a/components/pmo/core/src/wlan_pmo_gtk.c
+++ b/components/pmo/core/src/wlan_pmo_gtk.c
@@ -137,7 +137,7 @@ static QDF_STATUS pmo_core_is_gtk_enabled_in_fwr(
 		pmo_err("cache request mac:%pM, peer mac:%pM are not same",
 			vdev_ctx->vdev_gtk_req.bssid.bytes,
 			peer_bssid.bytes);
-		 return QDF_STATUS_E_INVAL;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	if (vdev_ctx->vdev_gtk_req.flags != PMO_GTK_OFFLOAD_ENABLE) {
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index cdf2053d2f..26f5e114a5 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2662,9 +2662,9 @@ tMgmtFrmDropReason lim_is_pkt_candidate_for_drop(tpAniSirGlobal pMac,
 					       dph_table);
 		if (!sta_ds) {
 			if (subType == SIR_MAC_MGMT_ASSOC_REQ)
-			    return eMGMT_DROP_NO_DROP;
+				return eMGMT_DROP_NO_DROP;
 			else
-			    return eMGMT_DROP_EXCESSIVE_MGMT_FRAME;
+				return eMGMT_DROP_EXCESSIVE_MGMT_FRAME;
 		}
 
 		if (subType == SIR_MAC_MGMT_ASSOC_REQ)
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index de6f234b94..f9d56f329c 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -1090,9 +1090,9 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
 					session_entry->protStaCache[i].addr,
 					sta_ds->staAddr,
 					sizeof(tSirMacAddr)))) {
-				 session_entry->gLim11gParams.numSta--;
-				 session_entry->protStaCache[i].active = false;
-				 break;
+				session_entry->gLim11gParams.numSta--;
+				session_entry->protStaCache[i].active = false;
+				break;
 			}
 		}
 
diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c
index 8e48076c1a..de1ac660ec 100644
--- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c
+++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c
@@ -96,7 +96,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg,
 		 * don't trigger STA deletion to avoid the race
 		 * condition.
 		 */
-		 if ((stads &&
+		if ((stads &&
 		     ((stads->mlmStaContext.mlmState !=
 			eLIM_MLM_LINK_ESTABLISHED_STATE) &&
 		      (stads->mlmStaContext.mlmState !=
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 e07f8c1579..a1739c714c 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -1332,7 +1332,7 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				   pBody, frameLen);
-		    goto err;
+		goto err;
 	} else if (DOT11F_WARNED(nStatus)) {
 		pe_debug("There were warnings while unpacking a Radio Measure request (0x%08x, %d bytes):",
 			nStatus, frameLen);
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index be6a957a3d..d181ac2643 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -852,7 +852,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 	if (assoc_rsp->QosMapSet.present)
 		qdf_mem_copy(&session_entry->QosMapSet,
 			&assoc_rsp->QosMapSet, sizeof(tSirQosMapSet));
-	 else
+	else
 		qdf_mem_zero(&session_entry->QosMapSet, sizeof(tSirQosMapSet));
 
 	if (assoc_rsp->obss_scanparams.present)
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index d3613d1e37..c3f02c081b 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -260,7 +260,7 @@ static void populate_dot11f_tdls_offchannel_params(
 		}
 
 		if (valid_count >= ARRAY_SIZE(suppChannels->bands))
-			 break;
+			break;
 		suppChannels->bands[valid_count][0] = validChan[i];
 		suppChannels->bands[valid_count][1] = 1;
 		valid_count++;
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index f2daddfa4e..cdc36065fd 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -2402,7 +2402,7 @@ lim_send_bss_color_change_ie_update(tpAniSirGlobal mac_ctx,
 	/* Update the beacon template and send to FW */
 	if (sch_set_fixed_beacon_fields(mac_ctx, session) != QDF_STATUS_SUCCESS) {
 		pe_err("Unable to set BSS color change IE in beacon");
-	       return;
+		return;
 	}
 
 	/* Send update beacon template message */
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 289301199e..b6bba1e80a 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -1048,7 +1048,7 @@ static bool sap_check_channels_same_band(uint16_t ch_num1, uint16_t ch_num2)
 	     ch_num2 <= SIR_11B_CHANNEL_END) ||
 	    (ch_num1 >= SIR_11A_CHANNEL_BEGIN &&
 	     ch_num2 >= SIR_11A_CHANNEL_BEGIN))
-	    return true;
+		return true;
 
 	return false;
 }
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 170d16d93a..846d60ce94 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -2609,7 +2609,7 @@ static void csr_update_bss_with_fils_data(tpAniSirGlobal mac_ctx,
 				SIR_FILS_IND_ELEM_OFFSET,
 				*(scan_entry->ie_list.fils_indication + 1),
 				&fils_indication, false);
-	 if (DOT11F_FAILED(ret)) {
+	if (DOT11F_FAILED(ret)) {
 		sme_err("unpack failed ret: 0x%x", ret);
 		return;
 	}
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index 7f37039fb5..ac8b1bac04 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -3102,7 +3102,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params)
 	    (params->restart_on_chan_switch == true)) {
 		wma->interfaces[req.vdev_id].is_channel_switch = true;
 		req.hidden_ssid = intr[vdev_id].vdev_restart_params.ssidHidden;
-	    }
+	}
 
 	if (params->restart_on_chan_switch == true &&
 			wma->interfaces[req.vdev_id].beacon_filter_enabled)
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index f687b2eb92..1427abd901 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -2453,7 +2453,7 @@ static void wma_vdev_stats_lost_link_helper(tp_wma_handle wma,
 		    (WMA_DELETE_BSS_REQ != req_msg->msg_type)) {
 			WMA_LOGD(FL("cannot find DELETE_BSS request message"));
 			return;
-		 }
+		}
 		bcn_snr = vdev_stats->vdev_snr.bcn_snr;
 		dat_snr = vdev_stats->vdev_snr.dat_snr;
 		WMA_LOGD(FL("get vdev id %d, beancon snr %d, data snr %d"),
diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 4d520999be..003a92c5d3 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -115,10 +115,10 @@ typedef struct timer_list A_TIMER;
 
 #define wait_event_interruptible_timeout(wq, condition, timeout)	\
 	({									\
-		 long __ret = timeout;						 \
-		 if (!(condition))						 \
-			 __wait_event_interruptible_timeout(wq, condition, __ret); \
-		 __ret;								 \
+		long __ret = timeout;						 \
+		if (!(condition))						 \
+			__wait_event_interruptible_timeout(wq, condition, __ret); \
+		__ret;								 \
 	 })
 #endif /* wait_event_interruptible_timeout */