[PATCH 30/30] staging: comedi: usbdux: consolidate usbduxsub_unlink_{in, out}urbs()

[H Hartley Sweeten]

These functions are identical other than the which and how many urbs
are unlinked.

Consolidate the functions into one usbdux_unlink_urbs() function.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/usbdux.c | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/comedi/drivers/usbdux.c 
b/drivers/staging/comedi/drivers/usbdux.c
index b94c655..7ff731f 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -229,23 +229,20 @@ struct usbdux_private {
        struct semaphore sem;
 };
 
-static void usbduxsub_unlink_inurbs(struct comedi_device *dev)
+static void usbdux_unlink_urbs(struct urb **urbs, int num_urbs)
 {
-       struct usbdux_private *devpriv = dev->private;
        int i;
 
-       if (devpriv->ai_urbs) {
-               for (i = 0; i < devpriv->n_ai_urbs; i++)
-                       usb_kill_urb(devpriv->ai_urbs[i]);
-       }
+       for (i = 0; i < num_urbs; i++)
+               usb_kill_urb(urbs[i]);
 }
 
 static void usbdux_ai_stop(struct comedi_device *dev, int do_unlink)
 {
        struct usbdux_private *devpriv = dev->private;
 
-       if (do_unlink)
-               usbduxsub_unlink_inurbs(dev);
+       if (do_unlink && devpriv->ai_urbs)
+               usbdux_unlink_urbs(devpriv->ai_urbs, devpriv->n_ai_urbs);
 
        devpriv->ai_cmd_running = 0;
 }
@@ -389,23 +386,12 @@ static void usbduxsub_ai_isoc_irq(struct urb *urb)
        comedi_event(dev, s);
 }
 
-static void usbduxsub_unlink_outurbs(struct comedi_device *dev)
-{
-       struct usbdux_private *devpriv = dev->private;
-       int i;
-
-       if (devpriv->ao_urbs) {
-               for (i = 0; i < devpriv->n_ao_urbs; i++)
-                       usb_kill_urb(devpriv->ao_urbs[i]);
-       }
-}
-
 static void usbdux_ao_stop(struct comedi_device *dev, int do_unlink)
 {
        struct usbdux_private *devpriv = dev->private;
 
-       if (do_unlink)
-               usbduxsub_unlink_outurbs(dev);
+       if (do_unlink && devpriv->ao_urbs)
+               usbdux_unlink_urbs(devpriv->ao_urbs, devpriv->n_ao_urbs);
 
        devpriv->ao_cmd_running = 0;
 }
-- 
1.8.3.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel