summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-10-26 07:01:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-26 09:07:46 -0700
commitea50aab519738a2cbb890053e255419c0b39e962 (patch)
tree87b1ab440b18510287e7e795613b204bb7ad6f54 /drivers/staging
parent7f7a252cd0dc65565f0fd62a8364670dac77e21b (diff)
staging: csr: remove csrPanic and CSR_LOG_ASSERT and CSR_LOG_ASSERT_ENABLE
these are not called at anypoint or enabled at anyplace in the code, remove them Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/csr/Makefile3
-rw-r--r--drivers/staging/csr/csr_framework_ext.c1
-rw-r--r--drivers/staging/csr/csr_log.h13
-rw-r--r--drivers/staging/csr/csr_msgconv.c1
-rw-r--r--drivers/staging/csr/csr_panic.c20
-rw-r--r--drivers/staging/csr/csr_panic.h53
-rw-r--r--drivers/staging/csr/csr_wifi_fsm_types.h1
7 files changed, 1 insertions, 91 deletions
diff --git a/drivers/staging/csr/Makefile b/drivers/staging/csr/Makefile
index ab626edc5ba4..dbd135a8b177 100644
--- a/drivers/staging/csr/Makefile
+++ b/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/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c
index 5b2bc4bdeffa..2aabb6c6b0af 100644
--- a/drivers/staging/csr/csr_framework_ext.c
+++ b/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/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h
index 304f065d5b48..9eb8c098845c 100644
--- a/drivers/staging/csr/csr_log.h
+++ b/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/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index 0081a255e91c..db5e845e60f5 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/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/drivers/staging/csr/csr_panic.c b/drivers/staging/csr/csr_panic.c
deleted file mode 100644
index 095f7fa3ae2c..000000000000
--- a/drivers/staging/csr/csr_panic.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*****************************************************************************
-
- (c) Cambridge Silicon Radio Limited 2010
- All rights reserved and confidential information of CSR
-
- Refer to LICENSE.txt included with this source for details
- on the license terms.
-
-*****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-
-#include "csr_panic.h"
-
-void CsrPanic(u8 tech, u16 reason, const char *p)
-{
- BUG_ON(1);
-}
-EXPORT_SYMBOL_GPL(CsrPanic);
diff --git a/drivers/staging/csr/csr_panic.h b/drivers/staging/csr/csr_panic.h
deleted file mode 100644
index 37989fc15bbe..000000000000
--- a/drivers/staging/csr/csr_panic.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef CSR_PANIC_H__
-#define CSR_PANIC_H__
-/*****************************************************************************
-
- (c) Cambridge Silicon Radio Limited 2010
- All rights reserved and confidential information of CSR
-
- Refer to LICENSE.txt included with this source for details
- on the license terms.
-
-*****************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Synergy techonology ID definitions */
-#define CSR_TECH_FW 0
-#define CSR_TECH_BT 1
-#define CSR_TECH_WIFI 2
-#define CSR_TECH_GPS 3
-#define CSR_TECH_NFC 4
-
-/* Panic type ID definitions for technology type CSR_TECH_FW */
-#define CSR_PANIC_FW_UNEXPECTED_VALUE 0
-#define CSR_PANIC_FW_HEAP_EXHAUSTION 1
-#define CSR_PANIC_FW_INVALID_PFREE_POINTER 2
-#define CSR_PANIC_FW_EXCEPTION 3
-#define CSR_PANIC_FW_ASSERTION_FAIL 4
-#define CSR_PANIC_FW_NULL_TASK_HANDLER 5
-#define CSR_PANIC_FW_UNKNOWN_TASK 6
-#define CSR_PANIC_FW_QUEUE_ACCESS_VIOLATION 7
-#define CSR_PANIC_FW_TOO_MANY_MESSAGES 8
-#define CSR_PANIC_FW_TOO_MANY_TIMED_EVENTS 9
-#define CSR_PANIC_FW_ABCSP_SYNC_LOST 10
-#define CSR_PANIC_FW_OVERSIZE_ABCSP_PRIM 11
-#define CSR_PANIC_FW_H4_CORRUPTION 12
-#define CSR_PANIC_FW_H4_SYNC_LOST 13
-#define CSR_PANIC_FW_H4_RX_OVERRUN 14
-#define CSR_PANIC_FW_H4_TX_OVERRUN 15
-#define CSR_PANIC_FW_TM_BC_RESTART_FAIL 16
-#define CSR_PANIC_FW_TM_BC_START_FAIL 17
-#define CSR_PANIC_FW_TM_BC_BAD_STATE 18
-#define CSR_PANIC_FW_TM_BC_TRANSPORT_LOST 19
-
-/* Panic interface used by technologies */
-/* DEPRECATED - replaced by csr_log_text.h */
-void CsrPanic(u8 tech, u16 reason, const char *p);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CSR_PANIC_H__ */
diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h
index 26752bf316e0..90ef77e07833 100644
--- a/drivers/staging/csr/csr_wifi_fsm_types.h
+++ b/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