Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2601699 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove comedi_debug module parameter 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9a431f2

drivers/staging/comedi/Makefile

+2 −0
Original line number Diff line number Diff line 
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

drivers/staging/comedi/comedi_fops.c

+0 −11
Original line number Diff line number Diff line
@@ -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,

drivers/staging/comedi/comedidev.h

+1 −10
Original line number Diff line number Diff line
@@ -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

 */

drivers/staging/comedi/drivers/Makefile

+1 −0
Original line number Diff line number Diff line 
# Makefile for individual comedi drivers

#

ccflags-$(CONFIG_COMEDI_DEBUG)		:= -DDEBUG



# Comedi "helper" modules

drivers/staging/comedi/drivers/ni_mio_cs.c

+0 −2
Original line number Diff line number Diff line
@@ -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