diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 53d33fc265a8..73822aa7b9ac 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -4699,25 +4699,25 @@ enum hdd_link_speed_rpt_type {
 #define CFG_VHT_CHANNEL_WIDTH_DEFAULT        (2)
 
 /*
-* <ini>
-* gVhtRxMCS - VHT Rx MCS capability for 1x1 mode
-* @Min: 0
-* @Max: 2
-* @Default: 0
-*
-* This ini is  used to set VHT Rx MCS capability for 1x1 mode.
-* 0, MCS0-7
-* 1, MCS0-8
-* 2, MCS0-9
-*
-* Related: NA
-*
-* Supported Feature: 11AC
-*
-* Usage: Internal/External
-*
-* </ini>
-*/
+ * <ini>
+ * gVhtRxMCS - VHT Rx MCS capability for 1x1 mode
+ * @Min: 0
+ * @Max: 2
+ * @Default: 0
+ *
+ * This ini is  used to set VHT Rx MCS capability for 1x1 mode.
+ * 0, MCS0-7
+ * 1, MCS0-8
+ * 2, MCS0-9
+ *
+ * Related: NA
+ *
+ * Supported Feature: 11AC
+ *
+ * Usage: Internal/External
+ *
+ * </ini>
+ */
 
 #define CFG_VHT_ENABLE_RX_MCS_8_9               "gVhtRxMCS"
 #define CFG_VHT_ENABLE_RX_MCS_8_9_MIN           (0)
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 806bbe449291..d649ca67555d 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -15264,7 +15264,7 @@ static bool wlan_hdd_handle_sap_sta_dfs_conc(struct hdd_adapter *adapter,
 	}
 
 	/*
-     * If channel is 0 or DFS or LTE unsafe then better to call pcl and
+	 * If channel is 0 or DFS or LTE unsafe then better to call pcl and
 	 * find out the best channel. If channel is non-dfs 5 GHz then
 	 * better move SAP to STA's channel to make scc, so we have room
 	 * for 3port MCC scenario.
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c
index 8acfd73b0132..d68c133ef363 100644
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -1915,7 +1915,8 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa)
 
 	/* If RM feature enabled
 	 * Request PROD Resource first
-	 * PROD resource may return sync or async manners */
+	 * PROD resource may return sync or async manners
+	 */
 	if (hdd_ipa_is_rm_enabled(hdd_ctx)) {
 		if (!ipa_rm_request_resource(IPA_RM_RESOURCE_WLAN_PROD)) {
 			/* RM PROD request sync return
@@ -2663,7 +2664,8 @@ static void __hdd_ipa_wdi_meter_notifier_cb(enum ipa_wdi_meter_evt_type evt,
 	switch (evt) {
 	case IPA_GET_WDI_SAP_STATS:
 		/* fill-up ipa_get_wdi_sap_stats structure after getting
-		   ipa_uc_fw_stats from FW */
+		 * ipa_uc_fw_stats from FW
+		 */
 		wdi_sap_stats = data;
 
 		if (!adapter) {
@@ -2718,7 +2720,8 @@ static void __hdd_ipa_wdi_meter_notifier_cb(enum ipa_wdi_meter_evt_type evt,
 		break;
 	case IPA_SET_WIFI_QUOTA:
 		/* get ipa_set_wifi_quota structure from IPA and pass to FW
-		   through quota_exceeded field in ipa_uc_fw_stats */
+		 * through quota_exceeded field in ipa_uc_fw_stats
+		 */
 		ipa_set_quota = data;
 
 		if (!adapter) {
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index 4f53007db72f..7c02960e1361 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -3135,9 +3135,9 @@ static uint32_t set_first_connection_operating_channel(
 	set_value = set_value << 8;
 
 	/*
-	* Store the channel number of 1st channel at bits 7-0
-	* of the bit vector
-	*/
+	 * Store the channel number of 1st channel at bits 7-0
+	 * of the bit vector
+	 */
 	return set_value | operating_channel;
 }
 
@@ -3171,16 +3171,16 @@ static uint32_t set_second_connection_operating_channel(
 	hdd_info("Second connection channel No.:%d and quota:%dms",
 			operating_channel, set_value);
 	/*
-	* Now move the time quota and channel number of the
-	* 1st adapter to bits 23-16 and bits 15-8 of the bit
-	* vector, respectively.
-	*/
+	 * Now move the time quota and channel number of the
+	 * 1st adapter to bits 23-16 and bits 15-8 of the bit
+	 * vector, respectively.
+	 */
 	set_value = set_value << 8;
 
 	/*
-	* Set the channel number for 2nd MCC vdev at bits
-	* 7-0 of set_value
-	*/
+	 * Set the channel number for 2nd MCC vdev at bits
+	 * 7-0 of set_value
+	 */
 	return set_value | operating_channel;
 }
 
diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c
index 845ec5693994..259cd615aee1 100644
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -1089,11 +1089,11 @@ static bool hdd_is_mcast_replay(struct sk_buff *skb)
 }
 
 /**
-* hdd_is_arp_local() - check if local or non local arp
-* @skb: pointer to sk_buff
-*
-* Return: true if local arp or false otherwise.
-*/
+ * hdd_is_arp_local() - check if local or non local arp
+ * @skb: pointer to sk_buff
+ *
+ * Return: true if local arp or false otherwise.
+ */
 static bool hdd_is_arp_local(struct sk_buff *skb)
 {
 	struct arphdr *arp;
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 107659575fe3..946d36e02d7f 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -1112,7 +1112,7 @@ static const struct ccp_freq_chan_map freq_chan_map[] = {
  * Usage: External
  *
  * </ioctl>
-*/
+ */
 #define WE_SET_WOW_DATA_INACTIVITY_TO    94