From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 23 May 2013 19:44:39 +0000 (-0700)
Subject: staging: comedi: usbduxsigma: absorb usbduxsub_unlink_PwmURBs() into caller
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f31260f9c85f140e0e3fbff6406cd3e05c88907d;p=linux-beck.git

staging: comedi: usbduxsigma: absorb usbduxsub_unlink_PwmURBs() into caller

This function is only called by usbdux_pwm_stop(). Absorb 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/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 2c8f78b19078..08710bfdc4e9 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -1590,16 +1590,12 @@ static int usbdux_dio_insn_bits(struct comedi_device *dev,
 	return insn->n;
 }
 
-static void usbduxsub_unlink_PwmURBs(struct usbduxsub *devpriv)
-{
-	if (devpriv->urbPwm)
-		usb_kill_urb(devpriv->urbPwm);
-}
-
 static void usbdux_pwm_stop(struct usbduxsub *devpriv, int do_unlink)
 {
-	if (do_unlink)
-		usbduxsub_unlink_PwmURBs(devpriv);
+	if (do_unlink) {
+		if (devpriv->urbPwm)
+			usb_kill_urb(devpriv->urbPwm);
+	}
 
 	devpriv->pwm_cmd_running = 0;
 }