Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee7d9e9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: usbdux: tidy up usbdux_ao_cancel() 



Rename the local variable used for the private data pointer to the
comedi "norm".

Remove the unnecessary sanity check of the private data pointer. This
function can only be called is the private data was allocated during
the attach.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c8ed94e

drivers/staging/comedi/drivers/usbdux.c

+7 −10
Original line number Original line Diff line number Diff line
@@ -449,22 +449,19 @@ static int usbdux_ao_stop(struct comedi_device *dev, int do_unlink) 
	return ret;

	return ret;

}

}





/* force unlink, is called by comedi */

static int usbdux_ao_cancel(struct comedi_device *dev,

static int usbdux_ao_cancel(struct comedi_device *dev,

			    struct comedi_subdevice *s)

			    struct comedi_subdevice *s)

{

{

	struct usbdux_private *this_usbduxsub = dev->private;

	struct usbdux_private *devpriv = dev->private;

	int res = 0;

	int ret = 0;



	if (!this_usbduxsub)

		return -EFAULT;





	/* prevent other CPUs from submitting a command just now */

	/* prevent other CPUs from submitting a command just now */

	down(&this_usbduxsub->sem);

	down(&devpriv->sem);

	/* unlink only if it is really running */

	/* unlink only if it is really running */

	res = usbdux_ao_stop(dev, this_usbduxsub->ao_cmd_running);

	ret = usbdux_ao_stop(dev, devpriv->ao_cmd_running);

	up(&this_usbduxsub->sem);

	up(&devpriv->sem);

	return res;



	return ret;

}

}





static void usbduxsub_ao_isoc_irq(struct urb *urb)

static void usbduxsub_ao_isoc_irq(struct urb *urb)