[PATCH 31/39] staging: comedi: usbduxfast: tidy up usbduxfast_ai_cancel()

H Hartley Sweeten hsweeten at visionengravers.com
Tue May 14 20:38:48 UTC 2013


Remove the unnecessary comments and dev_err() noise.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfonudation.org>
---
 drivers/staging/comedi/drivers/usbduxfast.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index dd4f177..9120df7 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -200,23 +200,16 @@ static int usbduxfast_ai_stop(struct comedi_device *dev, int do_unlink)
 	return 0;
 }
 
-/*
- * This will cancel a running acquisition operation.
- * This is called by comedi but never from inside the driver.
- */
 static int usbduxfast_ai_cancel(struct comedi_device *dev,
 				struct comedi_subdevice *s)
 {
 	struct usbduxfast_private *devpriv = dev->private;
 	int ret;
 
-	/* force unlink of all urbs */
-	if (!devpriv) {
-		dev_err(dev->class_dev, "%s: devpriv=NULL\n", __func__);
+	if (!devpriv)
 		return -EFAULT;
-	}
+
 	down(&devpriv->sem);
-	/* unlink */
 	ret = usbduxfast_ai_stop(dev, 1);
 	up(&devpriv->sem);
 
-- 
1.8.1.4




More information about the devel mailing list