Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: vmk80xx: remove CONFIG_COMEDI_DEBUG code

Browse source 
If CONFIG_COMEDI_DEBUG is defined a macro is enabled to output some
printk(KERN_REBUG ...) messages. These are just added noise. Remove
it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-02-05 17:30:01 -07:00 committed by Greg Kroah-Hartman
parent 6f25a527ea
commit 4c56a2b639
1 changed files with 8 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/staging/comedi/drivers/vmk80xx.c
View file

@ -123,18 +123,6 @@ enum {
#define URB_RCV_FLAG (1 << 0)
#define URB_SND_FLAG (1 << 1)
#ifdef CONFIG_COMEDI_DEBUG
static int dbgcm = 1;
#else
static int dbgcm;
#endif
#define dbgcm(fmt, arg...) \
do { \
if (dbgcm) \
printk(KERN_DEBUG fmt, ##arg); \
} while (0)
enum vmk80xx_model {
VMK8055_MODEL,
VMK8061_MODEL
@ -212,12 +200,6 @@ static void vmk80xx_tx_callback(struct urb *urb)
{
struct vmk80xx_private *devpriv = urb->context;
unsigned long *flags = &devpriv->flags;
int stat = urb->status;
if (stat && !(stat == -ENOENT
|| stat == -ECONNRESET || stat == -ESHUTDOWN))
dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
__func__, stat);
if (!test_bit(TRANS_OUT_BUSY, flags))
return;
@ -241,26 +223,16 @@ static void vmk80xx_rx_callback(struct urb *urb)
case -ESHUTDOWN:
break;
default:
dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
__func__, stat);
goto resubmit;
/* Try to resubmit the urb */
if (test_bit(TRANS_IN_RUNNING, flags) && devpriv->intf) {
usb_anchor_urb(urb, &devpriv->rx_anchor);
if (usb_submit_urb(urb, GFP_KERNEL))
usb_unanchor_urb(urb);
}
break;
}
goto exit;
resubmit:
if (test_bit(TRANS_IN_RUNNING, flags) && devpriv->intf) {
usb_anchor_urb(urb, &devpriv->rx_anchor);
if (!usb_submit_urb(urb, GFP_KERNEL))
goto exit;
dev_err(&urb->dev->dev,
"comedi#: vmk80xx: %s - submit urb failed\n",
__func__);
usb_unanchor_urb(urb);
}
exit:
clear_bit(TRANS_IN_BUSY, flags);
wake_up_interruptible(&devpriv->read_wait);
@ -1187,8 +1159,6 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,
if (vmk80xx_check_data_link(devpriv)) {
vmk80xx_read_eeprom(devpriv, IC6_VERSION);
dev_info(&intf->dev, "%s\n", devpriv->fw.ic6_vers);
} else {
dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
}
}