staging: comedi: usbduxsigma: tidy up usbduxsub_submit_PwmURBs()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 23 May 2013 19:51:14 +0000 (12:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2013 11:40:53 +0000 (20:40 +0900)
Rename the CamelCase function.

Pass the comedi_device pointer instead of the private data pointer
to the function.

Use a couple local variables to tidy up the function.

Remove the dev_err() message when usb_submit_urb() fails, its just
added noise.

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>
drivers/staging/comedi/drivers/usbduxsigma.c

index 3d8f17a7a25719d795846e10d1f5624a6f14e010..106dbef36ae87f9dfdfba47949563841c8709dbe 100644 (file)
@@ -1481,29 +1481,18 @@ static void usbduxsub_pwm_irq(struct urb *urb)
        }
 }
 
-static int usbduxsub_submit_PwmURBs(struct usbduxsigma_private *usbduxsub)
+static int usbduxsigma_submit_pwm_urb(struct comedi_device *dev)
 {
-       int errFlag;
-
-       if (!usbduxsub)
-               return -EFAULT;
+       struct usb_device *usb = comedi_to_usb_dev(dev);
+       struct usbduxsigma_private *devpriv = dev->private;
+       struct urb *urb = devpriv->urbPwm;
 
        /* in case of a resubmission after an unlink... */
-       usb_fill_bulk_urb(usbduxsub->urbPwm,
-                         usbduxsub->usbdev,
-                         usb_sndbulkpipe(usbduxsub->usbdev, PWM_EP),
-                         usbduxsub->urbPwm->transfer_buffer,
-                         usbduxsub->sizePwmBuf, usbduxsub_pwm_irq,
-                         usbduxsub->comedidev);
-
-       errFlag = usb_submit_urb(usbduxsub->urbPwm, GFP_ATOMIC);
-       if (errFlag) {
-               dev_err(&usbduxsub->interface->dev,
-                       "comedi_: usbduxsigma: pwm: usb_submit_urb error %d\n",
-                       errFlag);
-               return errFlag;
-       }
-       return 0;
+       usb_fill_bulk_urb(urb, usb, usb_sndbulkpipe(usb, PWM_EP),
+                         urb->transfer_buffer, devpriv->sizePwmBuf,
+                         usbduxsub_pwm_irq, dev);
+
+       return usb_submit_urb(urb, GFP_ATOMIC);
 }
 
 static int usbdux_pwm_period(struct comedi_device *dev,
@@ -1552,12 +1541,11 @@ static int usbdux_pwm_start(struct comedi_device *dev,
        for (i = 0; i < this_usbduxsub->sizePwmBuf; i++)
                ((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0;
 
-       this_usbduxsub->pwm_cmd_running = 1;
-       ret = usbduxsub_submit_PwmURBs(this_usbduxsub);
-       if (ret < 0) {
-               this_usbduxsub->pwm_cmd_running = 0;
+       ret = usbduxsigma_submit_pwm_urb(dev);
+       if (ret < 0)
                return ret;
-       }
+       this_usbduxsub->pwm_cmd_running = 1;
+
        return 0;
 }