diff options
| author | Seunghun Lee <waydi1@gmail.com> | 2014-07-28 22:51:03 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 17:15:12 -0700 |
| commit | e325f661cbeca23208967a3fad8389a717de1d16 (patch) | |
| tree | 37dbbbbd808252f81cf194476dd0f0d421ee9542 /drivers/staging/dgnc | |
| parent | 81a208f8a0c257893a3469d4071ac551e166fc30 (diff) | |
staging: dgnc: removes unused if defined code
DGNC_TRACER and TRC_TO_KMEM are never defined.
This patch removes if defined DGNC_TRACER and TRC_TO_KMEM code.
CC: Lidza Louina <lidza.louina@gmail.com>
CC: Mark Hounschell <markh@compro.net>
Signed-off-by: Seunghun Lee <waydi1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgnc')
| -rw-r--r-- | drivers/staging/dgnc/dgnc_driver.c | 4 | ||||
| -rw-r--r-- | drivers/staging/dgnc/dgnc_driver.h | 53 | ||||
| -rw-r--r-- | drivers/staging/dgnc/dgnc_trace.c | 8 |
3 files changed, 0 insertions, 65 deletions
diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index 68460af9e169..a5be9111987d 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -388,10 +388,6 @@ void dgnc_cleanup_module(void) dgnc_tty_post_uninit(); -#if defined(DGNC_TRACER) - /* last thing, make sure we release the tracebuffer */ - dgnc_tracer_free(); -#endif if (dgnc_NumBoards) pci_unregister_driver(&dgnc_driver); } diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h index b40ee2c9f61c..58b5aa7b68ed 100644 --- a/drivers/staging/dgnc/dgnc_driver.h +++ b/drivers/staging/dgnc/dgnc_driver.h @@ -91,57 +91,6 @@ #define DBG_CARR (dgnc_debug & 0x10000) - -#if defined(DGNC_TRACER) - -# if defined(TRC_TO_KMEM) -/* Choose one: */ -# define TRC_ON_OVERFLOW_WRAP_AROUND -# undef TRC_ON_OVERFLOW_SHIFT_BUFFER -# endif /* TRC_TO_KMEM */ - -# define TRC_MAXMSG 1024 -# define TRC_OVERFLOW "(OVERFLOW)" -# define TRC_DTRC "/usr/bin/dtrc" - -#if defined TRC_TO_CONSOLE -#define PRINTF_TO_CONSOLE(args) { printk(DRVSTR": "); printk args; } -#else /* !defined TRACE_TO_CONSOLE */ -#define PRINTF_TO_CONSOLE(args) -#endif - -#if defined TRC_TO_KMEM -#define PRINTF_TO_KMEM(args) dgnc_tracef args -#else /* !defined TRC_TO_KMEM */ -#define PRINTF_TO_KMEM(args) -#endif - -#define TRC(args) { PRINTF_TO_KMEM(args); PRINTF_TO_CONSOLE(args) } - -# define DPR_INIT(ARGS) if (DBG_INIT) TRC(ARGS) -# define DPR_BASIC(ARGS) if (DBG_BASIC) TRC(ARGS) -# define DPR_CORE(ARGS) if (DBG_CORE) TRC(ARGS) -# define DPR_OPEN(ARGS) if (DBG_OPEN) TRC(ARGS) -# define DPR_CLOSE(ARGS) if (DBG_CLOSE) TRC(ARGS) -# define DPR_READ(ARGS) if (DBG_READ) TRC(ARGS) -# define DPR_WRITE(ARGS) if (DBG_WRITE) TRC(ARGS) -# define DPR_IOCTL(ARGS) if (DBG_IOCTL) TRC(ARGS) -# define DPR_PROC(ARGS) if (DBG_PROC) TRC(ARGS) -# define DPR_PARAM(ARGS) if (DBG_PARAM) TRC(ARGS) -# define DPR_PSCAN(ARGS) if (DBG_PSCAN) TRC(ARGS) -# define DPR_EVENT(ARGS) if (DBG_EVENT) TRC(ARGS) -# define DPR_DRAIN(ARGS) if (DBG_DRAIN) TRC(ARGS) -# define DPR_CARR(ARGS) if (DBG_CARR) TRC(ARGS) -# define DPR_MGMT(ARGS) if (DBG_MGMT) TRC(ARGS) -# define DPR_INTR(ARGS) if (DBG_INTR) TRC(ARGS) -# define DPR_MSIGS(ARGS) if (DBG_MSIGS) TRC(ARGS) - -# define DPR(ARGS) if (dgnc_debug) TRC(ARGS) -# define P(X) dgnc_tracef(#X "=%p\n", X) -# define X(X) dgnc_tracef(#X "=%x\n", X) - -#else/* !defined DGNC_TRACER */ - #define PRINTF_TO_KMEM(args) # define TRC(ARGS) # define DPR_INIT(ARGS) @@ -164,8 +113,6 @@ # define DPR(args) -#endif/* DGNC_TRACER */ - /* Number of boards we support at once. */ #define MAXBOARDS 20 #define MAXPORTS 8 diff --git a/drivers/staging/dgnc/dgnc_trace.c b/drivers/staging/dgnc/dgnc_trace.c index d76415431686..3bb225957ff6 100644 --- a/drivers/staging/dgnc/dgnc_trace.c +++ b/drivers/staging/dgnc/dgnc_trace.c @@ -42,14 +42,6 @@ /* file level globals */ static char *dgnc_trcbuf; /* the ringbuffer */ -#if defined(TRC_TO_KMEM) -static int dgnc_trcbufi = 0; /* index of the tilde at the end of */ -#endif - -#if defined(TRC_TO_KMEM) -static DEFINE_SPINLOCK(dgnc_tracef_lock); -#endif - /* * dgnc_tracer_free() * |