diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index 66bd9bd..58b4785 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -2151,12 +2151,12 @@ unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame)
 				rtw_list_delete(&pstat->asoc_list);
 				pstapriv->asoc_list_cnt--;
 				if (pstat->expire_to > 0)
-					;/* TODO: STA re_auth within expire_to */
+					{ } /* TODO: STA re_auth within expire_to */
 			}
 			_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
 
 			if (seq == 1)
-				; /* TODO: STA re_auth and auth timeout */
+				{ } /* TODO: STA re_auth and auth timeout */
 
 		}
 	}
diff --git a/hal/phydm/halrf/halrf_debug.h b/hal/phydm/halrf/halrf_debug.h
index 858a273..290bfc2 100644
--- a/hal/phydm/halrf/halrf_debug.h
+++ b/hal/phydm/halrf/halrf_debug.h
@@ -96,7 +96,7 @@ static __inline void RF_DBG(struct dm_struct *dm, int comp, char *fmt, ...)
 {
 }
 #else
-#define RF_DBG(dm, comp, fmt, args...)
+#define RF_DBG(dm, comp, fmt, args...) do {} while (0)
 #endif
 
 #endif /*#if DBG*/
diff --git a/hal/phydm/phydm_debug.c b/hal/phydm/phydm_debug.c
index 3301d53..15323de 100644
--- a/hal/phydm/phydm_debug.c
+++ b/hal/phydm/phydm_debug.c
@@ -3268,7 +3268,7 @@ static void phydm_dump_bb_reg(void *dm_void, u32 *_used, char *output, u32 *_out
 #if (ODM_IC_11AC_SERIES_SUPPORT)
 		phydm_dump_bb_reg_ac(dm, &used, output, &out_len);
 #else
-		;
+		{ }
 #endif
 
 	*_used = used;
diff --git a/hal/phydm/phydm_debug.h b/hal/phydm/phydm_debug.h
index 05f06c2..ed6f585 100644
--- a/hal/phydm/phydm_debug.h
+++ b/hal/phydm/phydm_debug.h
@@ -238,7 +238,7 @@ static __inline void PHYDM_DBG_F(PDM_ODM_T dm, int comp, char *fmt, ...)
 
 #elif defined(DM_ODM_CE_MAC80211_V2)
 
-#define PHYDM_DBG(dm, comp, fmt, args...)
+#define PHYDM_DBG(dm, comp, fmt, args...) do {} while (0)
 #define PHYDM_DBG_F(dm, comp, fmt, args...)
 #define PHYDM_PRINT_ADDR(dm, comp, title_str, addr)
 
@@ -295,7 +295,7 @@ static __inline void PHYDM_DBG_F(struct dm_struct *dm, int comp, char *fmt, ...)
 {
 }
 #else
-#define PHYDM_DBG(dm, comp, fmt, args...)
+#define PHYDM_DBG(dm, comp, fmt, args...) do {} while (0)
 #define PHYDM_DBG_F(dm, comp, fmt, args...)
 #endif
 #define PHYDM_PRINT_ADDR(dm, comp, title_str, ptr)
diff --git a/include/rtw_debug.h b/include/rtw_debug.h
index ccd8d3e..7729047 100644
--- a/include/rtw_debug.h
+++ b/include/rtw_debug.h
@@ -216,7 +216,7 @@ extern uint rtw_drv_log_level;
 #ifdef CONFIG_DBG_COUNTER
 	#define DBG_COUNTER(counter) counter++
 #else
-	#define DBG_COUNTER(counter)
+	#define DBG_COUNTER(counter) do {} while (0)
 #endif
 
 void dump_drv_version(void *sel);