diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index aecc44b7de..2033ebe9e2 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -117,9 +117,12 @@ static inline void qdf_trace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
 #endif
 
 #ifdef PANIC_ON_BUG
-#define __qdf_do_bug() BUG_ON(1)
+static inline void QDF_DEBUG_PANIC(void)
+{
+	BUG();
+}
 #else
-#define __qdf_do_bug()
+static inline void QDF_DEBUG_PANIC(void) { }
 #endif
 
 #define QDF_BUG(_condition) \
@@ -127,7 +130,7 @@ static inline void qdf_trace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
 		if (!(_condition)) { \
 			pr_err("QDF BUG in %s Line %d: Failed assertion '" \
 			       #_condition "'\n", __func__, __LINE__); \
-			__qdf_do_bug();\
+			QDF_DEBUG_PANIC(); \
 		} \
 	} while (0)
 
diff --git a/qdf/linux/src/qdf_mc_timer.c b/qdf/linux/src/qdf_mc_timer.c
index 9525c36d21..7e436dbaa1 100644
--- a/qdf/linux/src/qdf_mc_timer.c
+++ b/qdf/linux/src/qdf_mc_timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -174,7 +174,7 @@ EXPORT_SYMBOL(qdf_mc_timer_manager_init);
 
 static inline void qdf_mc_timer_panic(void)
 {
-	QDF_BUG(0);
+	QDF_DEBUG_PANIC();
 }
 
 static void qdf_mc_timer_print_list(qdf_list_t *timers)