diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2012-02-06 18:39:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-09 12:38:19 -0500 |
commit | 451196a338c681a95a79469cd58a54e657904e06 (patch) | |
tree | d4e6b12b880008643fabe1ec6b814612b4e0713a /drivers/staging/tidspbridge | |
parent | f7c908ef871fcb319096caa7e839091b1feabd24 (diff) |
staging: tidspbridge: remove CONFIG_TIDSPBRIDGE_DEBUG
Since all the asserts and DBC macros are gone, the kconfig macro
CONFIG_TIDSPBRIDGE_DEBUG is not almost used, but for printing trace messages.
Since it is almost not used, I don't see any case for keep it churning the
configuration menu.
This patch removes completely the kconfig macro CONFIG_TIDSPBRIDGE_DEBUG,
using only TIDSPBRIDGE_BACKTRACE for enabling the debug trace messages.
Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/tidspbridge')
-rw-r--r-- | drivers/staging/tidspbridge/Kconfig | 6 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/io_sm.c | 12 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/io_sm.h | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/drivers/staging/tidspbridge/Kconfig b/drivers/staging/tidspbridge/Kconfig index 21a559ecbbb..d660891303b 100644 --- a/drivers/staging/tidspbridge/Kconfig +++ b/drivers/staging/tidspbridge/Kconfig | |||
@@ -31,12 +31,6 @@ config TIDSPBRIDGE_MEMPOOL_SIZE | |||
31 | Allocate specified size of memory at booting time to avoid allocation | 31 | Allocate specified size of memory at booting time to avoid allocation |
32 | failure under heavy memory fragmentation after some use time. | 32 | failure under heavy memory fragmentation after some use time. |
33 | 33 | ||
34 | config TIDSPBRIDGE_DEBUG | ||
35 | bool "Debug Support" | ||
36 | depends on TIDSPBRIDGE | ||
37 | help | ||
38 | Say Y to enable Bridge debugging capabilities | ||
39 | |||
40 | config TIDSPBRIDGE_RECOVERY | 34 | config TIDSPBRIDGE_RECOVERY |
41 | bool "Recovery Support" | 35 | bool "Recovery Support" |
42 | depends on TIDSPBRIDGE | 36 | depends on TIDSPBRIDGE |
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c index d47b861d61a..9b50b5bd4ed 100644 --- a/drivers/staging/tidspbridge/core/io_sm.c +++ b/drivers/staging/tidspbridge/core/io_sm.c | |||
@@ -111,7 +111,7 @@ struct io_mgr { | |||
111 | struct mgr_processorextinfo ext_proc_info; | 111 | struct mgr_processorextinfo ext_proc_info; |
112 | struct cmm_object *cmm_mgr; /* Shared Mem Mngr */ | 112 | struct cmm_object *cmm_mgr; /* Shared Mem Mngr */ |
113 | struct work_struct io_workq; /* workqueue */ | 113 | struct work_struct io_workq; /* workqueue */ |
114 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) | 114 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) |
115 | u32 trace_buffer_begin; /* Trace message start address */ | 115 | u32 trace_buffer_begin; /* Trace message start address */ |
116 | u32 trace_buffer_end; /* Trace message end address */ | 116 | u32 trace_buffer_end; /* Trace message end address */ |
117 | u32 trace_buffer_current; /* Trace message current address */ | 117 | u32 trace_buffer_current; /* Trace message current address */ |
@@ -243,7 +243,7 @@ int bridge_io_destroy(struct io_mgr *hio_mgr) | |||
243 | /* Free IO DPC object */ | 243 | /* Free IO DPC object */ |
244 | tasklet_kill(&hio_mgr->dpc_tasklet); | 244 | tasklet_kill(&hio_mgr->dpc_tasklet); |
245 | 245 | ||
246 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) | 246 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) |
247 | kfree(hio_mgr->msg); | 247 | kfree(hio_mgr->msg); |
248 | #endif | 248 | #endif |
249 | dsp_wdt_exit(); | 249 | dsp_wdt_exit(); |
@@ -383,7 +383,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr) | |||
383 | status = -EFAULT; | 383 | status = -EFAULT; |
384 | } | 384 | } |
385 | if (!status) { | 385 | if (!status) { |
386 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) | 386 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) |
387 | status = | 387 | status = |
388 | cod_get_sym_value(cod_man, DSP_TRACESEC_END, &shm0_end); | 388 | cod_get_sym_value(cod_man, DSP_TRACESEC_END, &shm0_end); |
389 | #else | 389 | #else |
@@ -728,7 +728,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr) | |||
728 | hmsg_mgr->max_msgs); | 728 | hmsg_mgr->max_msgs); |
729 | memset((void *)hio_mgr->shared_mem, 0, sizeof(struct shm)); | 729 | memset((void *)hio_mgr->shared_mem, 0, sizeof(struct shm)); |
730 | 730 | ||
731 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) | 731 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) |
732 | /* Get the start address of trace buffer */ | 732 | /* Get the start address of trace buffer */ |
733 | status = cod_get_sym_value(cod_man, SYS_PUTCBEG, | 733 | status = cod_get_sym_value(cod_man, SYS_PUTCBEG, |
734 | &hio_mgr->trace_buffer_begin); | 734 | &hio_mgr->trace_buffer_begin); |
@@ -907,7 +907,7 @@ void io_dpc(unsigned long ref_data) | |||
907 | } | 907 | } |
908 | 908 | ||
909 | #endif | 909 | #endif |
910 | #ifdef CONFIG_TIDSPBRIDGE_DEBUG | 910 | #ifdef CONFIG_TIDSPBRIDGE_BACKTRACE |
911 | if (pio_mgr->intr_val & MBX_DBG_SYSPRINTF) { | 911 | if (pio_mgr->intr_val & MBX_DBG_SYSPRINTF) { |
912 | /* Notify DSP Trace message */ | 912 | /* Notify DSP Trace message */ |
913 | print_dsp_debug_trace(pio_mgr); | 913 | print_dsp_debug_trace(pio_mgr); |
@@ -1666,7 +1666,7 @@ int bridge_io_get_proc_load(struct io_mgr *hio_mgr, | |||
1666 | } | 1666 | } |
1667 | 1667 | ||
1668 | 1668 | ||
1669 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) | 1669 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) |
1670 | void print_dsp_debug_trace(struct io_mgr *hio_mgr) | 1670 | void print_dsp_debug_trace(struct io_mgr *hio_mgr) |
1671 | { | 1671 | { |
1672 | u32 ul_new_message_length = 0, ul_gpp_cur_pointer; | 1672 | u32 ul_new_message_length = 0, ul_gpp_cur_pointer; |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h index a054dad2133..903ff12b14d 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h | |||
@@ -154,8 +154,6 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context); | |||
154 | 154 | ||
155 | void dump_dl_modules(struct bridge_dev_context *bridge_context); | 155 | void dump_dl_modules(struct bridge_dev_context *bridge_context); |
156 | 156 | ||
157 | #endif | ||
158 | #if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG) | ||
159 | void print_dsp_debug_trace(struct io_mgr *hio_mgr); | 157 | void print_dsp_debug_trace(struct io_mgr *hio_mgr); |
160 | #endif | 158 | #endif |
161 | 159 | ||