leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-07-25 16:12:30 -07:00 committed by Greg Kroah-Hartman
parent 757fbc2a78
commit 0c4349c916
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/comedi/drivers/usbdux.c
View File

@ -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;
}