diff --git a/core/hdd/inc/wlan_hdd_ipa.h b/core/hdd/inc/wlan_hdd_ipa.h
index 77fd185e6b0c..f61a46960992 100644
--- a/core/hdd/inc/wlan_hdd_ipa.h
+++ b/core/hdd/inc/wlan_hdd_ipa.h
@@ -265,7 +265,6 @@ static inline QDF_STATUS hdd_ipa_uc_ol_init(struct hdd_context *hdd_ctx)
 
 static inline void hdd_ipa_set_tx_flow_info(void)
 {
-	return;
 }
 
 /**
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 883ae15ae070..7ca0b217966a 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -2230,7 +2230,6 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit);
 static inline void hdd_init_nud_stats_ctx(struct hdd_context *hdd_ctx)
 {
 	init_completion(&hdd_ctx->nud_stats_context.response_event);
-	return;
 }
 
 void wlan_hdd_soc_set_antenna_mode_cb(enum set_antenna_mode_status status);
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 6e154012bbf1..b79987ae26f3 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -2417,8 +2417,6 @@ static void hdd_change_peer_state_after_set_key(struct hdd_adapter *adapter,
 	}
 
 	hdd_sta_ctx->roam_info.roamingState = HDD_ROAM_STATE_NONE;
-
-	return;
 }
 
 /**
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 13baf638bd52..e607a01a7e1d 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -6775,8 +6775,6 @@ void wlan_hdd_display_tx_rx_histogram(struct hdd_context *hdd_ctx)
 					hdd_ctx->hdd_txrx_hist[i].
 						next_tx_level));
 	}
-
-	return;
 }
 
 /**
@@ -10044,8 +10042,6 @@ static void hdd_get_nud_stats_cb(void *data, struct rsp_stats *rsp)
 	spin_unlock(&hdd_context_lock);
 
 	EXIT();
-
-	return;
 }
 
 /**
@@ -12018,9 +12014,8 @@ static inline void hdd_update_pno_config(struct pno_user_cfg *pno_cfg,
 #else
 static inline void
 hdd_update_pno_config(struct pno_user_cfg *pno_cfg,
-	struct hdd_config *cfg)
+		      struct hdd_config *cfg)
 {
-	return;
 }
 #endif
 
@@ -12471,7 +12466,6 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 	}
 end:
 	mutex_unlock(&hdd_ctx->sap_lock);
-	return;
 }
 
 /**
diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c
index e68d88288d89..d3e374497ec4 100644
--- a/core/hdd/src/wlan_hdd_memdump.c
+++ b/core/hdd/src/wlan_hdd_memdump.c
@@ -132,8 +132,6 @@ void wlan_hdd_cfg80211_fw_mem_dump_cb(void *ctx,
 	}
 	complete(&context->response_event);
 	spin_unlock(&hdd_context_lock);
-
-	return;
 }
 
 /**
diff --git a/core/hdd/src/wlan_hdd_rx_monitor.c b/core/hdd/src/wlan_hdd_rx_monitor.c
index 204aa754a993..282efc2c0784 100644
--- a/core/hdd/src/wlan_hdd_rx_monitor.c
+++ b/core/hdd/src/wlan_hdd_rx_monitor.c
@@ -100,8 +100,6 @@ void hdd_rx_monitor_callback(ol_osif_vdev_handle context,
 
 		skb = skb_next;
 	}
-
-	return;
 }
 
 /**