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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 5ba963281cfe2adef2776ef6a014851da58fd2f2..8ec5985121ee9912cb9dae515f417f1d6895cf8b 100644 (file)
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -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;
-       }
-
-       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;
+               /* Try to resubmit the urb */
+               if (test_bit(TRANS_IN_RUNNING, flags) && devpriv->intf) {
+                       usb_anchor_urb(urb, &devpriv->rx_anchor);
 
-               dev_err(&urb->dev->dev,
-                       "comedi#: vmk80xx: %s - submit urb failed\n",
-                       __func__);
-
-               usb_unanchor_urb(urb);
+                       if (usb_submit_urb(urb, GFP_KERNEL))
+                               usb_unanchor_urb(urb);
+               }
+               break;
        }
-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");
                }
        }