[PATCH 34/77] staging: comedi: usbduxsigma: tidy up usbdux_ai_inttrig()
H Hartley Sweeten
hsweeten at visionengravers.com
Thu May 23 19:53:23 UTC 2013
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.
Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/usbduxsigma.c | 37 +++++++++++-----------------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 5cdba42..7fcf30c 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -754,36 +754,29 @@ static int receive_dux_commands(struct comedi_device *dev, int command)
return -EFAULT;
}
-static int usbdux_ai_inttrig(struct comedi_device *dev,
- struct comedi_subdevice *s, unsigned int trignum)
+static int usbduxsigma_ai_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;
int ret;
- down(&this_usbduxsub->sem);
- if (trignum != 0) {
- dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux_ai_inttrig: invalid trignum\n",
- dev->minor);
- up(&this_usbduxsub->sem);
+ if (trignum != 0)
return -EINVAL;
- }
- if (!this_usbduxsub->ai_cmd_running) {
- ret = usbduxsigma_submit_urbs(dev, this_usbduxsub->urbIn,
- this_usbduxsub->numOfInBuffers,
- 1);
+
+ down(&devpriv->sem);
+ if (!devpriv->ai_cmd_running) {
+ ret = usbduxsigma_submit_urbs(dev, devpriv->urbIn,
+ devpriv->numOfInBuffers, 1);
if (ret < 0) {
- up(&this_usbduxsub->sem);
+ up(&devpriv->sem);
return ret;
}
- this_usbduxsub->ai_cmd_running = 1;
+ devpriv->ai_cmd_running = 1;
s->async->inttrig = NULL;
- } else {
- dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: ai_inttrig but acqu is already running\n",
- dev->minor);
}
- up(&this_usbduxsub->sem);
+ up(&devpriv->sem);
+
return 1;
}
@@ -893,7 +886,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* TRIG_INT */
/* don't enable the acquision operation */
/* wait for an internal signal */
- s->async->inttrig = usbdux_ai_inttrig;
+ s->async->inttrig = usbduxsigma_ai_inttrig;
}
up(&this_usbduxsub->sem);
return 0;
--
1.8.1.4
More information about the devel
mailing list