leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: remove comedi_debug module parameter

Browse Source 
Remove this module parameter and use the CONFIG_COMEDI_DEBUG option to
enable normal kernel debugging with -DDEBUG flag.

Remove the #undef DEBUG from all the comedi source files so they will
honour the -DDEBUG flag.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-11-22 10:45:38 -07:00 committed by Greg Kroah-Hartman
parent f9a431f2e0
commit d2601699d3
6 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/comedi/Makefile
View File

@ -1,3 +1,5 @@
ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG
comedi-y := comedi_fops.o range.o drivers.o \
comedi_buf.o
comedi-$(CONFIG_COMEDI_PCI_DRIVERS) += comedi_pci.o

11
drivers/staging/comedi/comedi_fops.c
View File

@ -16,8 +16,6 @@
GNU General Public License for more details.
*/
#undef DEBUG
#include "comedi_compat32.h"
#include <linux/module.h>
@ -47,15 +45,6 @@
#define COMEDI_NUM_SUBDEVICE_MINORS \
(COMEDI_NUM_MINORS - COMEDI_NUM_BOARD_MINORS)
#ifdef CONFIG_COMEDI_DEBUG
int comedi_debug;
EXPORT_SYMBOL_GPL(comedi_debug);
module_param(comedi_debug, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(comedi_debug,
"enable comedi core and driver debugging if non-zero (default 0)"
);
#endif
static int comedi_num_legacy_minors;
module_param(comedi_num_legacy_minors, int, S_IRUGO);
MODULE_PARM_DESC(comedi_num_legacy_minors,

11
drivers/staging/comedi/comedidev.h
View File

@ -27,10 +27,7 @@
#include "comedi.h"
#define DPRINTK(format, args...) do { \
if (comedi_debug) \
pr_debug("comedi: " format, ## args); \
} while (0)
#define DPRINTK(format, args...) pr_debug("comedi: " format, ## args);
#define COMEDI_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
#define COMEDI_VERSION_CODE COMEDI_VERSION(COMEDI_MAJORVERSION, \
@ -216,12 +213,6 @@ static inline const void *comedi_board(const struct comedi_device *dev)
return dev->board_ptr;
}
#ifdef CONFIG_COMEDI_DEBUG
extern int comedi_debug;
#else
static const int comedi_debug;
#endif
/*
* function prototypes
*/

1
drivers/staging/comedi/drivers/Makefile
View File

@ -1,5 +1,6 @@
# Makefile for individual comedi drivers
#
ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG
# Comedi "helper" modules

2
drivers/staging/comedi/drivers/ni_mio_cs.c
View File

@ -47,8 +47,6 @@ See the notes in the ni_atmio.o driver.
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
#undef DEBUG
#define ATMIO 1
#undef PCIMIO

2
drivers/staging/comedi/kcomedilib/Makefile
View File

@ -1,3 +1,5 @@
ccflags-$(CONFIG_COMEDI_DEBUG) := -DDEBUG
obj-$(CONFIG_COMEDI_KCOMEDILIB) += kcomedilib.o
kcomedilib-objs := kcomedilib_main.o