Browse Source

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>
Víctor Manuel Jáquez Leal 13 years ago
parent
commit
451196a338

+ 0 - 6
drivers/staging/tidspbridge/Kconfig

@@ -31,12 +31,6 @@ config TIDSPBRIDGE_MEMPOOL_SIZE
 	  Allocate specified size of memory at booting time to avoid allocation
 	  Allocate specified size of memory at booting time to avoid allocation
 	  failure under heavy memory fragmentation after some use time.
 	  failure under heavy memory fragmentation after some use time.
 
 
-config TIDSPBRIDGE_DEBUG
-	bool "Debug Support"
-	depends on TIDSPBRIDGE
-	help
-	  Say Y to enable Bridge debugging capabilities
-
 config TIDSPBRIDGE_RECOVERY
 config TIDSPBRIDGE_RECOVERY
 	bool "Recovery Support"
 	bool "Recovery Support"
 	depends on TIDSPBRIDGE
 	depends on TIDSPBRIDGE

+ 6 - 6
drivers/staging/tidspbridge/core/io_sm.c

@@ -111,7 +111,7 @@ struct io_mgr {
 	struct mgr_processorextinfo ext_proc_info;
 	struct mgr_processorextinfo ext_proc_info;
 	struct cmm_object *cmm_mgr;	/* Shared Mem Mngr */
 	struct cmm_object *cmm_mgr;	/* Shared Mem Mngr */
 	struct work_struct io_workq;	/* workqueue */
 	struct work_struct io_workq;	/* workqueue */
-#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
+#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE)
 	u32 trace_buffer_begin;	/* Trace message start address */
 	u32 trace_buffer_begin;	/* Trace message start address */
 	u32 trace_buffer_end;	/* Trace message end address */
 	u32 trace_buffer_end;	/* Trace message end address */
 	u32 trace_buffer_current;	/* Trace message current address */
 	u32 trace_buffer_current;	/* Trace message current address */
@@ -243,7 +243,7 @@ int bridge_io_destroy(struct io_mgr *hio_mgr)
 		/* Free IO DPC object */
 		/* Free IO DPC object */
 		tasklet_kill(&hio_mgr->dpc_tasklet);
 		tasklet_kill(&hio_mgr->dpc_tasklet);
 
 
-#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
+#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE)
 		kfree(hio_mgr->msg);
 		kfree(hio_mgr->msg);
 #endif
 #endif
 		dsp_wdt_exit();
 		dsp_wdt_exit();
@@ -383,7 +383,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
 		status = -EFAULT;
 		status = -EFAULT;
 	}
 	}
 	if (!status) {
 	if (!status) {
-#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
+#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE)
 		status =
 		status =
 		    cod_get_sym_value(cod_man, DSP_TRACESEC_END, &shm0_end);
 		    cod_get_sym_value(cod_man, DSP_TRACESEC_END, &shm0_end);
 #else
 #else
@@ -728,7 +728,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
 		hmsg_mgr->max_msgs);
 		hmsg_mgr->max_msgs);
 	memset((void *)hio_mgr->shared_mem, 0, sizeof(struct shm));
 	memset((void *)hio_mgr->shared_mem, 0, sizeof(struct shm));
 
 
-#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
+#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE)
 	/* Get the start address of trace buffer */
 	/* Get the start address of trace buffer */
 	status = cod_get_sym_value(cod_man, SYS_PUTCBEG,
 	status = cod_get_sym_value(cod_man, SYS_PUTCBEG,
 				   &hio_mgr->trace_buffer_begin);
 				   &hio_mgr->trace_buffer_begin);
@@ -907,7 +907,7 @@ void io_dpc(unsigned long ref_data)
 		}
 		}
 
 
 #endif
 #endif
-#ifdef CONFIG_TIDSPBRIDGE_DEBUG
+#ifdef CONFIG_TIDSPBRIDGE_BACKTRACE
 		if (pio_mgr->intr_val & MBX_DBG_SYSPRINTF) {
 		if (pio_mgr->intr_val & MBX_DBG_SYSPRINTF) {
 			/* Notify DSP Trace message */
 			/* Notify DSP Trace message */
 			print_dsp_debug_trace(pio_mgr);
 			print_dsp_debug_trace(pio_mgr);
@@ -1666,7 +1666,7 @@ int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
 }
 }
 
 
 
 
-#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
+#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE)
 void print_dsp_debug_trace(struct io_mgr *hio_mgr)
 void print_dsp_debug_trace(struct io_mgr *hio_mgr)
 {
 {
 	u32 ul_new_message_length = 0, ul_gpp_cur_pointer;
 	u32 ul_new_message_length = 0, ul_gpp_cur_pointer;

+ 0 - 2
drivers/staging/tidspbridge/include/dspbridge/io_sm.h

@@ -154,8 +154,6 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context);
 
 
 void dump_dl_modules(struct bridge_dev_context *bridge_context);
 void dump_dl_modules(struct bridge_dev_context *bridge_context);
 
 
-#endif
-#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
 void print_dsp_debug_trace(struct io_mgr *hio_mgr);
 void print_dsp_debug_trace(struct io_mgr *hio_mgr);
 #endif
 #endif