openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: usbduxsigma: tidy up usbdux_ao_inttrig() 

Rename the function so it has namespace associated with the driver.

Rename the local variable used for the private data pointer.

Remove the dev_err() messages, they are just added noise.

Refactor the code to remove the goto.

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>
This commit is contained in:
H Hartley Sweeten 2013-05-23 12:52:59 -07:00 committed by Greg Kroah-Hartman
parent edd2d33ee8
commit 2d4462d28a
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/staging/comedi/drivers/usbduxsigma.c
View File

@ -1093,37 +1093,30 @@ static int usbdux_ao_insn_write(struct comedi_device *dev,
return i; return i;
} }
static int usbdux_ao_inttrig(struct comedi_device *dev, static int usbduxsigma_ao_inttrig(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned int trignum) struct comedi_subdevice *s,
unsigned int trignum)
{ {
struct usbduxsigma_private *this_usbduxsub = dev->private; struct usbduxsigma_private *devpriv = dev->private;
int ret; int ret;
down(&this_usbduxsub->sem); if (trignum != 0)
if (trignum != 0) { return -EINVAL;
dev_err(&this_usbduxsub->interface->dev,
"comedi%d: usbdux_ao_inttrig: invalid trignum\n", down(&devpriv->sem);
dev->minor); if (!devpriv->ao_cmd_running) {
ret = -EINVAL; ret = usbduxsigma_submit_urbs(dev, devpriv->urbOut,
goto out; devpriv->numOfOutBuffers, 0);
} if (ret < 0) {
if (!(this_usbduxsub->ao_cmd_running)) { up(&devpriv->sem);
ret = usbduxsigma_submit_urbs(dev, this_usbduxsub->urbOut, return ret;
this_usbduxsub->numOfOutBuffers, }
0); devpriv->ao_cmd_running = 1;
if (ret < 0)
goto out;
this_usbduxsub->ao_cmd_running = 1;
s->async->inttrig = NULL; s->async->inttrig = NULL;
} else {
dev_err(&this_usbduxsub->interface->dev,
"comedi%d: ao_inttrig but acqu is already running.\n",
dev->minor);
} }
ret = 1; up(&devpriv->sem);
out:
up(&this_usbduxsub->sem); return 1;
return ret;
} }
static int usbdux_ao_cmdtest(struct comedi_device *dev, static int usbdux_ao_cmdtest(struct comedi_device *dev,
@ -1287,7 +1280,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* TRIG_INT */ /* TRIG_INT */
/* submit the urbs later */ /* submit the urbs later */
/* wait for an internal signal */ /* wait for an internal signal */
s->async->inttrig = usbdux_ao_inttrig; s->async->inttrig = usbduxsigma_ao_inttrig;
} }
up(&this_usbduxsub->sem); up(&this_usbduxsub->sem);