---

yaml --- r: 337296 b: refs/heads/master c: ea50aab h: refs/heads/master v: v3
git-mirror · Oct 26, 2012 · 36a8168 · 36a8168
1 parent 457ef99
commit 36a8168
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 92 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f7a252cd0dc65565f0fd62a8364670dac77e21b
+refs/heads/master: ea50aab519738a2cbb890053e255419c0b39e962
diff --git a/trunk/drivers/staging/csr/Makefile b/trunk/drivers/staging/csr/Makefile
@@ -70,5 +70,4 @@ csr_helper-y :=	csr_time.o			\
 		csr_framework_ext.o		\
 		csr_wifi_serialize_primitive_types.o	\
 		csr_serialize_primitive_types.o	\
-		csr_msgconv.o			\
-		csr_panic.o
+		csr_msgconv.o
diff --git a/trunk/drivers/staging/csr/csr_framework_ext.c b/trunk/drivers/staging/csr/csr_framework_ext.c
@@ -17,7 +17,6 @@
 #include <linux/bitops.h>
 
 #include "csr_framework_ext.h"
-#include "csr_panic.h"
 
 /*----------------------------------------------------------------------------*
  *  NAME

diff --git a/trunk/drivers/staging/csr/csr_log.h b/trunk/drivers/staging/csr/csr_log.h
@@ -11,7 +11,6 @@
 *****************************************************************************/
 
 #include "csr_sched.h"
-#include "csr_panic.h"
 #include "csr_prim_defs.h"
 #include "csr_msgconv.h"
 
@@ -80,18 +79,6 @@ u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
 #define CSR_LOG_STRINGIFY_REAL(a) (#a)
 #define CSR_LOG_STRINGIFY(a) CSR_LOG_STRINGIFY_REAL(a)
 
-#ifdef CSR_LOG_ASSERT_ENABLE
-#define CSR_LOG_ASSERT(cond) \
-	do { \
-		if (!(cond)) { \
-			char *panic_arg = "[" __FILE__ ":" CSR_LOG_STRINGIFY(__LINE__) "] - " CSR_LOG_STRINGIFY(cond); \
-			CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_ASSERTION_FAIL, panic_arg); \
-		} \
-	} while (0)
-#else
-#define CSR_LOG_ASSERT(cond)
-#endif
-
 typedef struct {
 	u16            primitiveType;
 	const char *primitiveName;

diff --git a/trunk/drivers/staging/csr/csr_msgconv.c b/trunk/drivers/staging/csr/csr_msgconv.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include "csr_panic.h"
 #include "csr_sched.h"
 #include "csr_msgconv.h"
 #include "csr_macro.h"

diff --git a/trunk/drivers/staging/csr/csr_panic.c b/trunk/drivers/staging/csr/csr_panic.c
diff --git a/trunk/drivers/staging/csr/csr_panic.h b/trunk/drivers/staging/csr/csr_panic.h
diff --git a/trunk/drivers/staging/csr/csr_wifi_fsm_types.h b/trunk/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -17,7 +17,6 @@ extern "C" {
 
 #include <linux/types.h>
 #include "csr_macro.h"
-#include "csr_panic.h"
 #include "csr_sched.h"
 
 #ifdef CSR_WIFI_FSM_MUTEX_ENABLE