Skip to content

Commit

Permalink
staging: comedi: me4000: remove PDEBUG macro
Browse files Browse the repository at this point in the history 
The PDEBUG macro is used to output a bunch of debug messages in the
driver. These messages might be useful when first creating the driver
but they shouldn't be in mainline. Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 15, 2012
1 parent ef5bbfc commit 871784a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 48 deletions.
35 changes: 0 additions & 35 deletions drivers/staging/comedi/drivers/me4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,11 +860,6 @@ static int ai_round_cmd_args(struct comedi_device *dev,
*scan_ticks = 0;
*chan_ticks = 0;

PDEBUG("ai_round_cmd_arg(): start_arg = %d\n", cmd->start_arg);
PDEBUG("ai_round_cmd_arg(): scan_begin_arg = %d\n",
cmd->scan_begin_arg);
PDEBUG("ai_round_cmd_arg(): convert_arg = %d\n", cmd->convert_arg);

if (cmd->start_arg) {
*init_ticks = (cmd->start_arg * 33) / 1000;
rest = (cmd->start_arg * 33) % 1000;
Expand Down Expand Up @@ -904,10 +899,6 @@ static int ai_round_cmd_args(struct comedi_device *dev,
}
}

PDEBUG("ai_round_cmd_args(): init_ticks = %d\n", *init_ticks);
PDEBUG("ai_round_cmd_args(): scan_ticks = %d\n", *scan_ticks);
PDEBUG("ai_round_cmd_args(): chan_ticks = %d\n", *chan_ticks);

return 0;
}

Expand Down Expand Up @@ -1083,32 +1074,6 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
unsigned int scan_ticks;
int err = 0;

PDEBUG("me4000_ai_do_cmd_test(): subdev = %d\n", cmd->subdev);
PDEBUG("me4000_ai_do_cmd_test(): flags = %08X\n", cmd->flags);
PDEBUG("me4000_ai_do_cmd_test(): start_src = %08X\n",
cmd->start_src);
PDEBUG("me4000_ai_do_cmd_test(): start_arg = %d\n",
cmd->start_arg);
PDEBUG("me4000_ai_do_cmd_test(): scan_begin_src = %08X\n",
cmd->scan_begin_src);
PDEBUG("me4000_ai_do_cmd_test(): scan_begin_arg = %d\n",
cmd->scan_begin_arg);
PDEBUG("me4000_ai_do_cmd_test(): convert_src = %08X\n",
cmd->convert_src);
PDEBUG("me4000_ai_do_cmd_test(): convert_arg = %d\n",
cmd->convert_arg);
PDEBUG("me4000_ai_do_cmd_test(): scan_end_src = %08X\n",
cmd->scan_end_src);
PDEBUG("me4000_ai_do_cmd_test(): scan_end_arg = %d\n",
cmd->scan_end_arg);
PDEBUG("me4000_ai_do_cmd_test(): stop_src = %08X\n",
cmd->stop_src);
PDEBUG("me4000_ai_do_cmd_test(): stop_arg = %d\n", cmd->stop_arg);
PDEBUG("me4000_ai_do_cmd_test(): chanlist = %d\n",
(unsigned int)cmd->chanlist);
PDEBUG("me4000_ai_do_cmd_test(): chanlist_len = %d\n",
cmd->chanlist_len);

/* Only rounding flags are implemented */
cmd->flags &= TRIG_ROUND_NEAREST | TRIG_ROUND_UP | TRIG_ROUND_DOWN;

Expand Down
13 changes: 0 additions & 13 deletions drivers/staging/comedi/drivers/me4000.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,6 @@
#ifndef _ME4000_H_
#define _ME4000_H_

/*=============================================================================
Debug section
===========================================================================*/

#undef ME4000_DEBUG /* General purpose debug masseges */

#ifdef ME4000_DEBUG
#undef PDEBUG
#define PDEBUG(fmt, args...) printk(KERN_DEBUG"comedi%d: me4000: " fmt, dev->minor, ##args)
#else
#define PDEBUG(fmt, args...) /* no debugging, do nothing */
#endif

/*=============================================================================
PCI vendor and device IDs
===========================================================================*/
Expand Down

0 comments on commit 871784a

Please sign in to comment.