From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8259A1CE9AF for ; Wed, 19 Feb 2014 18:12:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5AED732CED for ; Wed, 19 Feb 2014 18:12:34 +0000 (UTC) Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X5BAReId9y-N for ; Wed, 19 Feb 2014 18:12:31 +0000 (UTC) Received: from mx2.compro.net (mx2.comprocs.com [12.186.155.30]) by silver.osuosl.org (Postfix) with SMTP id 8B9E72FEBD for ; Wed, 19 Feb 2014 18:12:31 +0000 (UTC) From: Mark Hounschell Subject: [PATCH 07/19] staging: dgap: Remove unneeded dgap_trace.c and dgap_trace.h Date: Wed, 19 Feb 2014 13:12:03 -0500 Message-Id: <1392833535-25652-8-git-send-email-markh@compro.net> In-Reply-To: <1392833535-25652-1-git-send-email-markh@compro.net> References: <1392833535-25652-1-git-send-email-markh@compro.net> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman Removes unneeded files dgap_trace.c and dgap_trace.h Signed-off-by: Mark Hounschell --- drivers/staging/dgap/Makefile | 3 +- drivers/staging/dgap/dgap_driver.c | 1 - drivers/staging/dgap/dgap_trace.c | 185 ------------------------------------- drivers/staging/dgap/dgap_trace.h | 35 ------- 4 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 drivers/staging/dgap/dgap_trace.c delete mode 100644 drivers/staging/dgap/dgap_trace.h diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile index 13bf6fb..b7b5778 100644 --- a/drivers/staging/dgap/Makefile +++ b/drivers/staging/dgap/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_DGAP) += dgap.o -dgap-objs := dgap_driver.o \ - dgap_trace.o +dgap-objs := dgap_driver.o diff --git a/drivers/staging/dgap/dgap_driver.c b/drivers/staging/dgap/dgap_driver.c index cca35a0..d1c539b 100644 --- a/drivers/staging/dgap/dgap_driver.c +++ b/drivers/staging/dgap/dgap_driver.c @@ -55,7 +55,6 @@ #include "dgap_tty.h" #include "dgap_conf.h" #include "dgap_parse.h" -#include "dgap_trace.h" #include "dgap_sysfs.h" #include "dgap_types.h" diff --git a/drivers/staging/dgap/dgap_trace.c b/drivers/staging/dgap/dgap_trace.c deleted file mode 100644 index 3ffadcb..0000000 --- a/drivers/staging/dgap/dgap_trace.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright 2003 Digi International (www.digi.com) - * Scott H Kilau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - * NOTE TO LINUX KERNEL HACKERS: DO NOT REFORMAT THIS CODE! - * - * This is shared code between Digi's CVS archive and the - * Linux Kernel sources. - * Changing the source just for reformatting needlessly breaks - * our CVS diff history. - * - * Send any bug fixes/changes to: Eng.Linux at digi dot com. - * Thank you. - * - */ - - -#include -#include /* For jiffies, task states */ -#include /* For tasklet and interrupt structs/defines */ -#include - -#include "dgap_driver.h" -#include "dgap_trace.h" - -#define TRC_TO_CONSOLE 1 - -/* file level globals */ -static char *dgap_trcbuf; /* the ringbuffer */ - -#if defined(TRC_TO_KMEM) -static int dgap_trcbufi = 0; /* index of the tilde at the end of */ -#endif - -extern int dgap_trcbuf_size; /* size of the ringbuffer */ - -#if defined(TRC_TO_KMEM) -static DEFINE_SPINLOCK(dgap_tracef_lock); -#endif - -#if 0 - -#if !defined(TRC_TO_KMEM) && !defined(TRC_TO_CONSOLE) -void dgap_tracef(const char *fmt, ...) -{ - return; -} - -#else /* !defined(TRC_TO_KMEM) && !defined(TRC_TO_CONSOLE) */ - -void dgap_tracef(const char *fmt, ...) -{ - va_list ap; - char buf[TRC_MAXMSG+1]; - size_t lenbuf; - int i; - static int failed = FALSE; -# if defined(TRC_TO_KMEM) - unsigned long flags; -#endif - - if(failed) - return; -# if defined(TRC_TO_KMEM) - DGAP_LOCK(dgap_tracef_lock, flags); -#endif - - /* Format buf using fmt and arguments contained in ap. */ - va_start(ap, fmt); - i = vsprintf(buf, fmt, ap); - va_end(ap); - lenbuf = strlen(buf); - -# if defined(TRC_TO_KMEM) - { - static int initd=0; - - /* - * Now, in addition to (or instead of) printing this stuff out - * (which is a buffered operation), also tuck it away into a - * corner of memory which can be examined post-crash in kdb. - */ - if (!initd) { - dgap_trcbuf = (char *) vmalloc(dgap_trcbuf_size); - if(!dgap_trcbuf) { - failed = TRUE; - printk("dgap: tracing init failed!\n"); - return; - } - - memset(dgap_trcbuf, '\0', dgap_trcbuf_size); - dgap_trcbufi = 0; - initd++; - - printk("dgap: tracing enabled - " TRC_DTRC - " 0x%lx 0x%x\n", - (unsigned long)dgap_trcbuf, - dgap_trcbuf_size); - } - -# if defined(TRC_ON_OVERFLOW_WRAP_AROUND) - /* - * This is the less CPU-intensive way to do things. We simply - * wrap around before we fall off the end of the buffer. A - * tilde (~) demarcates the current end of the trace. - * - * This method should be used if you are concerned about race - * conditions as it is less likely to affect the timing of - * things. - */ - - if (dgap_trcbufi + lenbuf >= dgap_trcbuf_size) { - /* We are wrapping, so wipe out the last tilde. */ - dgap_trcbuf[dgap_trcbufi] = '\0'; - /* put the new string at the beginning of the buffer */ - dgap_trcbufi = 0; - } - - strcpy(&dgap_trcbuf[dgap_trcbufi], buf); - dgap_trcbufi += lenbuf; - dgap_trcbuf[dgap_trcbufi] = '~'; - -# elif defined(TRC_ON_OVERFLOW_SHIFT_BUFFER) - /* - * This is the more CPU-intensive way to do things. If we - * venture into the last 1/8 of the buffer, we shift the - * last 7/8 of the buffer forward, wiping out the first 1/8. - * Advantage: No wrap-around, only truncation from the - * beginning. - * - * This method should not be used if you are concerned about - * timing changes affecting the behaviour of the driver (ie, - * race conditions). - */ - strcpy(&dgap_trcbuf[dgap_trcbufi], buf); - dgap_trcbufi += lenbuf; - dgap_trcbuf[dgap_trcbufi] = '~'; - dgap_trcbuf[dgap_trcbufi+1] = '\0'; - - /* If we're near the end of the trace buffer... */ - if (dgap_trcbufi > (dgap_trcbuf_size/8)*7) { - /* Wipe out the first eighth to make some more room. */ - strcpy(dgap_trcbuf, &dgap_trcbuf[dgap_trcbuf_size/8]); - dgap_trcbufi = strlen(dgap_trcbuf)-1; - /* Plop overflow message at the top of the buffer. */ - bcopy(TRC_OVERFLOW, dgap_trcbuf, strlen(TRC_OVERFLOW)); - } -# else -# error "TRC_ON_OVERFLOW_WRAP_AROUND or TRC_ON_OVERFLOW_SHIFT_BUFFER?" -# endif - } - DGAP_UNLOCK(dgap_tracef_lock, flags); - -# endif /* defined(TRC_TO_KMEM) */ -} - -#endif /* !defined(TRC_TO_KMEM) && !defined(TRC_TO_CONSOLE) */ - -#endif - -/* - * dgap_tracer_free() - * - * - */ -void dgap_tracer_free(void) -{ - if(dgap_trcbuf) - vfree(dgap_trcbuf); -} diff --git a/drivers/staging/dgap/dgap_trace.h b/drivers/staging/dgap/dgap_trace.h deleted file mode 100644 index 47ef008..0000000 --- a/drivers/staging/dgap/dgap_trace.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2003 Digi International (www.digi.com) - * Scott H Kilau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * NOTE: THIS IS A SHARED HEADER. DO NOT CHANGE CODING STYLE!!! - * - ***************************************************************************** - * Header file for dgap_trace.c - * - */ - -#ifndef __DGAP_TRACE_H -#define __DGAP_TRACE_H - -#include "dgap_driver.h" - -void dgap_tracef(const char *fmt, ...); -void dgap_tracer_free(void); - -#endif - -- 1.8.1.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel