diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index b79987ae26f3..84fa434b9cbc 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -3173,13 +3173,13 @@ static QDF_STATUS hdd_association_completion_handler(struct hdd_adapter *adapter
 			hdd_clear_roam_profile_ie(adapter);
 		} else  if ((eCSR_ROAM_CANCELLED == roamStatus
 		    && !hddDisconInProgress)) {
-				hdd_connect_result(dev,
-						pWextState->req_bssId.bytes,
-						NULL, NULL, 0, NULL, 0,
-						WLAN_STATUS_UNSPECIFIED_FAILURE,
-						GFP_KERNEL,
-						connect_timeout,
-						timeout_reason);
+			hdd_connect_result(dev,
+					   pWextState->req_bssId.bytes,
+					   NULL, NULL, 0, NULL, 0,
+					   WLAN_STATUS_UNSPECIFIED_FAILURE,
+					   GFP_KERNEL,
+					   connect_timeout,
+					   timeout_reason);
 		}
 
 		/*
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 8e89b5d58065..c7bf5f2cf2b4 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -8413,7 +8413,7 @@ int hdd_parse_probe_req_ouis(struct hdd_context *hdd_ctx)
 		if (oui_indx >= MAX_PROBE_REQ_OUIS)
 			break;
 
-		next_token:
+next_token:
 		token = strsep(&str, " ");
 	}
 
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index d649ca67555d..ddae6fe640e9 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -3118,15 +3118,15 @@ static int __wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
 	}
 
 	if (nla_put_u32(reply_skb,
-		QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET_SIZE,
-		feature_sets) ||
+			QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET_SIZE,
+			feature_sets) ||
 	    nla_put(reply_skb,
-		QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET,
-		sizeof(u32) * feature_sets,
-		feature_set_matrix)) {
-			hdd_err("nla put fail");
-			kfree_skb(reply_skb);
-			return -EINVAL;
+		    QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET,
+		    sizeof(u32) * feature_sets,
+		    feature_set_matrix)) {
+		hdd_err("nla put fail");
+		kfree_skb(reply_skb);
+		return -EINVAL;
 	}
 	return cfg80211_vendor_cmd_reply(reply_skb);
 }
@@ -12737,7 +12737,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 	 */
 
 #if  defined QCA_WIFI_FTM
-}
+	}
 #endif
 
 	wiphy->max_scan_ssids = MAX_SCAN_SSID;
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index 053aaa6d74a2..65e81bfe28dd 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -1580,11 +1580,11 @@ static int wlan_hdd_send_ext_scan_capability(struct hdd_context *hdd_ctx)
 	    nla_put_u32(skb, MAX_NUM_EPNO_NETS_BY_SSID,
 			data->max_number_epno_networks_by_ssid) ||
 	    nla_put_u32(skb, MAX_NUM_WHITELISTED_SSID,
-		data->max_number_of_white_listed_ssid) ||
+			data->max_number_of_white_listed_ssid) ||
 	    nla_put_u32(skb, MAX_NUM_BLACKLISTED_BSSID,
-		data->max_number_of_black_listed_bssid)) {
-			hdd_err("nla put fail");
-			goto nla_put_failure;
+			data->max_number_of_black_listed_bssid)) {
+		hdd_err("nla put fail");
+		goto nla_put_failure;
 	}
 
 	cfg80211_vendor_cmd_reply(skb);
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 6ec90be09c99..63f771cdcf1d 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -7822,9 +7822,9 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 			for (i = 0;
 			     i < pConfig->supported_rates.numRates; i++) {
 				if (pIe[i]) {
-				     pConfig->supported_rates.rate[i] = pIe[i];
-				     hdd_debug("Configured Supported rate is %2x",
-					pConfig->supported_rates.rate[i]);
+					pConfig->supported_rates.rate[i] = pIe[i];
+					hdd_debug("Configured Supported rate is %2x",
+						  pConfig->supported_rates.rate[i]);
 				}
 			}
 		}
@@ -7837,9 +7837,9 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 			pIe++;
 			for (i = 0; i < pConfig->extended_rates.numRates; i++) {
 				if (pIe[i]) {
-				      pConfig->extended_rates.rate[i] = pIe[i];
-				      hdd_debug("Configured ext Supported rate is %2x",
-					pConfig->extended_rates.rate[i]);
+					pConfig->extended_rates.rate[i] = pIe[i];
+					hdd_debug("Configured ext Supported rate is %2x",
+						  pConfig->extended_rates.rate[i]);
 				}
 			}
 		}
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index e607a01a7e1d..89f295957c18 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -5584,8 +5584,9 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx)
 		    (adapter->device_mode == QDF_P2P_DEVICE_MODE) ||
 		    (adapter->device_mode == QDF_SAP_MODE) ||
 		    (adapter->device_mode == QDF_P2P_GO_MODE)) {
-		    wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
-				adapter->sessionId, INVALID_SCAN_ID, false);
+			wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
+					adapter->sessionId, INVALID_SCAN_ID,
+					false);
 		}
 		status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext);
 		adapterNode = pNext;
@@ -6417,7 +6418,7 @@ static void hdd_pld_request_bus_bandwidth(struct hdd_context *hdd_ctx,
 			}
 			if (cds_sched_handle_throughput_req(false))
 				hdd_warn("low bandwidth set rx affinity fail");
-		 } else {
+		} else {
 			if (!hdd_ctx->hbw_requested) {
 				pld_request_pm_qos(hdd_ctx->parent_dev, 1);
 				hdd_ctx->hbw_requested = true;
@@ -6425,7 +6426,7 @@ static void hdd_pld_request_bus_bandwidth(struct hdd_context *hdd_ctx,
 
 			if (cds_sched_handle_throughput_req(true))
 				hdd_warn("high bandwidth set rx affinity fail");
-		 }
+		}
 		hdd_napi_apply_throughput_policy(hdd_ctx, tx_packets, rx_packets);
 	}
 
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 946d36e02d7f..f6ade6018cf7 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -4441,9 +4441,9 @@ int hdd_set_11ax_rate(struct hdd_adapter *adapter, int set_value,
 		}
 	} else if (sap_config->SapHw_mode != eCSR_DOT11_MODE_11ax &&
 		   sap_config->SapHw_mode != eCSR_DOT11_MODE_11ax_ONLY) {
-			hdd_err("Invalid hw mode, SAP hw_mode= 0x%x, ch = %d",
-				sap_config->SapHw_mode, sap_config->channel);
-			return -EIO;
+		hdd_err("Invalid hw mode, SAP hw_mode= 0x%x, ch = %d",
+			sap_config->SapHw_mode, sap_config->channel);
+		return -EIO;
 	}
 
 	if (set_value != 0xff) {
@@ -11108,15 +11108,15 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		conn_info = policy_mgr_get_conn_info(&len);
 		pr_info("+--------------------------+\n");
 		for (i = 0; i < len; i++) {
-		     pr_info("|table_index[%d]\t\t\n", i);
-		     pr_info("|\t|vdev_id - %-10d|\n", conn_info->vdev_id);
-		     pr_info("|\t|chan    - %-10d|\n", conn_info->chan);
-		     pr_info("|\t|bw      - %-10d|\n", conn_info->bw);
-		     pr_info("|\t|mode    - %-10d|\n", conn_info->mode);
-		     pr_info("|\t|mac     - %-10d|\n", conn_info->mac);
-		     pr_info("|\t|in_use  - %-10d|\n", conn_info->in_use);
-		     pr_info("+--------------------------+\n");
-		     conn_info++;
+			pr_info("|table_index[%d]\t\t\n", i);
+			pr_info("|\t|vdev_id - %-10d|\n", conn_info->vdev_id);
+			pr_info("|\t|chan    - %-10d|\n", conn_info->chan);
+			pr_info("|\t|bw      - %-10d|\n", conn_info->bw);
+			pr_info("|\t|mode    - %-10d|\n", conn_info->mode);
+			pr_info("|\t|mac     - %-10d|\n", conn_info->mac);
+			pr_info("|\t|in_use  - %-10d|\n", conn_info->in_use);
+			pr_info("+--------------------------+\n");
+			conn_info++;
 		}
 	}
 	break;
@@ -11739,7 +11739,7 @@ static int iw_set_dynamic_mcbc_filter(struct net_device *dev,
 		"Configure broadcast filtering via ini item, 'g_enable_non_arp_bc_hw_filter.'\n"
 		"\tg_enable_non_arp_bc_hw_filter=1 # drop all non-ARP broadcast traffic\n"
 		"\tg_enable_non_arp_bc_hw_filter=0 # allow all broadcast traffic");
-	 return -EINVAL;
+	return -EINVAL;
 }
 
 /**