From 705a8f720154eea0c8f9801f6a9b30bbf5d7ca25 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 23 May 2013 12:43:07 -0700
Subject: [PATCH] staging: comedi: usbduxsigma: absorb
usbduxsub_unlink_InURBs() into caller
This function is only called by usbdux_ai_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>
---
drivers/staging/comedi/drivers/usbduxsigma.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 2add3efb4df1d..4d941408cd75f 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -252,20 +252,16 @@ static struct usbduxsub usbduxsub[NUMUSBDUX];
static DEFINE_SEMAPHORE(start_stop_sem);
-static void usbduxsub_unlink_InURBs(struct usbduxsub *devpriv)
+static void usbdux_ai_stop(struct usbduxsub *devpriv, int do_unlink)
{
- int i;
+ if (do_unlink) {
+ int i;
- for (i = 0; i < devpriv->numOfInBuffers; i++) {
- if (devpriv->urbIn[i])
- usb_kill_urb(devpriv->urbIn[i]);
+ for (i = 0; i < devpriv->numOfInBuffers; i++) {
+ if (devpriv->urbIn[i])
+ usb_kill_urb(devpriv->urbIn[i]);
+ }
}
-}
-
-static void usbdux_ai_stop(struct usbduxsub *devpriv, int do_unlink)
-{
- if (do_unlink)
- usbduxsub_unlink_InURBs(devpriv);
devpriv->ai_cmd_running = 0;
}
--
2.30.2