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>
-static int usbdux_ao_inttrig(struct comedi_device *dev,
- struct comedi_subdevice *s, unsigned int trignum)
+static int usbduxsigma_ao_inttrig(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ unsigned int trignum)
- struct usbduxsigma_private *this_usbduxsub = dev->private;
+ struct usbduxsigma_private *devpriv = dev->private;
- down(&this_usbduxsub->sem);
- if (trignum != 0) {
- dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ao_inttrig: invalid trignum\n",
- dev->minor);
- ret = -EINVAL;
- goto out;
- }
- if (!(this_usbduxsub->ao_cmd_running)) {
- ret = usbduxsigma_submit_urbs(dev, this_usbduxsub->urbOut,
- this_usbduxsub->numOfOutBuffers,
- 0);
- if (ret < 0)
- goto out;
- this_usbduxsub->ao_cmd_running = 1;
+ if (trignum != 0)
+ return -EINVAL;
+
+ down(&devpriv->sem);
+ if (!devpriv->ao_cmd_running) {
+ ret = usbduxsigma_submit_urbs(dev, devpriv->urbOut,
+ devpriv->numOfOutBuffers, 0);
+ if (ret < 0) {
+ up(&devpriv->sem);
+ return ret;
+ }
+ devpriv->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;
-out:
- up(&this_usbduxsub->sem);
- return ret;
+ up(&devpriv->sem);
+
+ return 1;
}
static int usbdux_ao_cmdtest(struct comedi_device *dev,
}
static int usbdux_ao_cmdtest(struct comedi_device *dev,
/* TRIG_INT */
/* submit the urbs later */
/* wait for an internal signal */
/* TRIG_INT */
/* submit the urbs later */
/* 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);