From aa68690fd1b3b8e859ff24e24dbf03a3a71f5ccd Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Mon, 5 Oct 2020 13:23:09 +0530 Subject: [PATCH] qcacmn: During qdf assert don't print generic failure information During qdf assert generic failure information printed at last is misleading failure reason, to avoid this don't print generic failure information. Change-Id: I55359b2e41a3ee50de4e45e73183f2480c28a1eb CRs-Fixed: 2789137 --- qdf/linux/src/i_qdf_trace.h | 14 ++++++++++++++ qdf/linux/src/i_qdf_util.h | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h index 58443ba83c68..a7b31f1e844d 100644 --- a/qdf/linux/src/i_qdf_trace.h +++ b/qdf/linux/src/i_qdf_trace.h @@ -414,6 +414,13 @@ static inline void __qdf_bug(void) } \ } while (0) +#define QDF_BUG_ON_ASSERT(_condition) \ + do { \ + if (!(_condition)) { \ + __qdf_bug(); \ + } \ + } while (0) + #else /* PANIC_ON_BUG */ #define QDF_DEBUG_PANIC(reason...) \ @@ -433,6 +440,13 @@ static inline void __qdf_bug(void) } \ } while (0) +#define QDF_BUG_ON_ASSERT(_condition) \ + do { \ + if (!(_condition)) { \ + /* no-op */ \ + } \ + } while (0) + #endif /* PANIC_ON_BUG */ #ifdef KSYM_SYMBOL_LEN diff --git a/qdf/linux/src/i_qdf_util.h b/qdf/linux/src/i_qdf_util.h index d06b8fc2120f..2e482d1d9649 100644 --- a/qdf/linux/src/i_qdf_util.h +++ b/qdf/linux/src/i_qdf_util.h @@ -211,7 +211,7 @@ static inline bool __qdf_is_macaddr_equal(struct qdf_mac_addr *mac_addr1, pr_err("Assertion failed! %s:%s %s:%d\n", \ # expr, __func__, __FILE__, __LINE__); \ dump_stack(); \ - QDF_BUG(0); \ + QDF_BUG_ON_ASSERT(0); \ } \ } while (0)