Commit ea50aab5 authored by Devendra Naga's avatar Devendra Naga Committed by Greg Kroah-Hartman

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: default avatarDevendra Naga <devendra.aaru@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f7a252c
...@@ -70,5 +70,4 @@ csr_helper-y := csr_time.o \ ...@@ -70,5 +70,4 @@ csr_helper-y := csr_time.o \
csr_framework_ext.o \ csr_framework_ext.o \
csr_wifi_serialize_primitive_types.o \ csr_wifi_serialize_primitive_types.o \
csr_serialize_primitive_types.o \ csr_serialize_primitive_types.o \
csr_msgconv.o \ csr_msgconv.o
csr_panic.o
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include "csr_framework_ext.h" #include "csr_framework_ext.h"
#include "csr_panic.h"
/*----------------------------------------------------------------------------* /*----------------------------------------------------------------------------*
* NAME * NAME
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
*****************************************************************************/ *****************************************************************************/
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_panic.h"
#include "csr_prim_defs.h" #include "csr_prim_defs.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
...@@ -80,18 +79,6 @@ u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); ...@@ -80,18 +79,6 @@ u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
#define CSR_LOG_STRINGIFY_REAL(a) (#a) #define CSR_LOG_STRINGIFY_REAL(a) (#a)
#define CSR_LOG_STRINGIFY(a) CSR_LOG_STRINGIFY_REAL(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 { typedef struct {
u16 primitiveType; u16 primitiveType;
const char *primitiveName; const char *primitiveName;
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_panic.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_macro.h" #include "csr_macro.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.
*****************************************************************************/
#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);
#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__ */
...@@ -17,7 +17,6 @@ extern "C" { ...@@ -17,7 +17,6 @@ extern "C" {
#include <linux/types.h> #include <linux/types.h>
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_panic.h"
#include "csr_sched.h" #include "csr_sched.h"
#ifdef CSR_WIFI_FSM_MUTEX_ENABLE #ifdef CSR_WIFI_FSM_MUTEX_ENABLE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment