Commit 4c56a2b6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: vmk80xx: remove CONFIG_COMEDI_DEBUG code

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f25a527
...@@ -123,18 +123,6 @@ enum { ...@@ -123,18 +123,6 @@ enum {
#define URB_RCV_FLAG (1 << 0) #define URB_RCV_FLAG (1 << 0)
#define URB_SND_FLAG (1 << 1) #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 { enum vmk80xx_model {
VMK8055_MODEL, VMK8055_MODEL,
VMK8061_MODEL VMK8061_MODEL
...@@ -212,12 +200,6 @@ static void vmk80xx_tx_callback(struct urb *urb) ...@@ -212,12 +200,6 @@ static void vmk80xx_tx_callback(struct urb *urb)
{ {
struct vmk80xx_private *devpriv = urb->context; struct vmk80xx_private *devpriv = urb->context;
unsigned long *flags = &devpriv->flags; 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)) if (!test_bit(TRANS_OUT_BUSY, flags))
return; return;
...@@ -241,26 +223,16 @@ static void vmk80xx_rx_callback(struct urb *urb) ...@@ -241,26 +223,16 @@ static void vmk80xx_rx_callback(struct urb *urb)
case -ESHUTDOWN: case -ESHUTDOWN:
break; break;
default: default:
dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n", /* Try to resubmit the urb */
__func__, stat); if (test_bit(TRANS_IN_RUNNING, flags) && devpriv->intf) {
goto resubmit; usb_anchor_urb(urb, &devpriv->rx_anchor);
}
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, if (usb_submit_urb(urb, GFP_KERNEL))
"comedi#: vmk80xx: %s - submit urb failed\n", usb_unanchor_urb(urb);
__func__); }
break;
usb_unanchor_urb(urb);
} }
exit:
clear_bit(TRANS_IN_BUSY, flags); clear_bit(TRANS_IN_BUSY, flags);
wake_up_interruptible(&devpriv->read_wait); wake_up_interruptible(&devpriv->read_wait);
...@@ -1187,8 +1159,6 @@ static int vmk80xx_auto_attach(struct comedi_device *dev, ...@@ -1187,8 +1159,6 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,
if (vmk80xx_check_data_link(devpriv)) { if (vmk80xx_check_data_link(devpriv)) {
vmk80xx_read_eeprom(devpriv, IC6_VERSION); vmk80xx_read_eeprom(devpriv, IC6_VERSION);
dev_info(&intf->dev, "%s\n", devpriv->fw.ic6_vers); dev_info(&intf->dev, "%s\n", devpriv->fw.ic6_vers);
} else {
dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment