Commit 0c4349c9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: usbdux: consolidate usbduxsub_unlink_{in, out}urbs()

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 757fbc2a
...@@ -229,23 +229,20 @@ struct usbdux_private { ...@@ -229,23 +229,20 @@ struct usbdux_private {
struct semaphore sem; 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; int i;
if (devpriv->ai_urbs) { for (i = 0; i < num_urbs; i++)
for (i = 0; i < devpriv->n_ai_urbs; i++) usb_kill_urb(urbs[i]);
usb_kill_urb(devpriv->ai_urbs[i]);
}
} }
static void usbdux_ai_stop(struct comedi_device *dev, int do_unlink) static void usbdux_ai_stop(struct comedi_device *dev, int do_unlink)
{ {
struct usbdux_private *devpriv = dev->private; struct usbdux_private *devpriv = dev->private;
if (do_unlink) if (do_unlink && devpriv->ai_urbs)
usbduxsub_unlink_inurbs(dev); usbdux_unlink_urbs(devpriv->ai_urbs, devpriv->n_ai_urbs);
devpriv->ai_cmd_running = 0; devpriv->ai_cmd_running = 0;
} }
...@@ -389,23 +386,12 @@ static void usbduxsub_ai_isoc_irq(struct urb *urb) ...@@ -389,23 +386,12 @@ static void usbduxsub_ai_isoc_irq(struct urb *urb)
comedi_event(dev, s); 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) static void usbdux_ao_stop(struct comedi_device *dev, int do_unlink)
{ {
struct usbdux_private *devpriv = dev->private; struct usbdux_private *devpriv = dev->private;
if (do_unlink) if (do_unlink && devpriv->ao_urbs)
usbduxsub_unlink_outurbs(dev); usbdux_unlink_urbs(devpriv->ao_urbs, devpriv->n_ao_urbs);
devpriv->ao_cmd_running = 0; devpriv->ao_cmd_running = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment