UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_labpc: cleanup trigger setting in labpc_ai_cmd() 

The (*do_cmdtest) already validated the cmd sources so the default
cases in the switch() statements can never happen.

Preclear to trigger bits and change the switch() statements to simple
if() tests to set the bits.

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-03-22 09:56:48 -07:00 committed by Greg Kroah-Hartman
parent 83d75effa7
commit 58cd9b91f8
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/comedi/drivers/ni_labpc.c
View File

@ -1054,38 +1054,21 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* startup acquisition */ /* startup acquisition */
/* cmd2 reg */
/* use 2 cascaded counters for pacing */
spin_lock_irqsave(&dev->spinlock, flags); spin_lock_irqsave(&dev->spinlock, flags);
/* use 2 cascaded counters for pacing */
devpriv->cmd2 |= CMD2_TBSEL; devpriv->cmd2 |= CMD2_TBSEL;
switch (cmd->start_src) {
case TRIG_EXT: devpriv->cmd2 &= ~(CMD2_SWTRIG | CMD2_HWTRIG | CMD2_PRETRIG);
if (cmd->start_src == TRIG_EXT)
devpriv->cmd2 |= CMD2_HWTRIG; devpriv->cmd2 |= CMD2_HWTRIG;
devpriv->cmd2 &= ~(CMD2_PRETRIG | CMD2_SWTRIG); else
break;
case TRIG_NOW:
devpriv->cmd2 |= CMD2_SWTRIG; devpriv->cmd2 |= CMD2_SWTRIG;
devpriv->cmd2 &= ~(CMD2_PRETRIG | CMD2_HWTRIG); if (cmd->stop_src == TRIG_EXT)
break;
default:
comedi_error(dev, "bug with start_src");
spin_unlock_irqrestore(&dev->spinlock, flags);
return -1;
break;
}
switch (cmd->stop_src) {
case TRIG_EXT:
devpriv->cmd2 |= (CMD2_HWTRIG | CMD2_PRETRIG); devpriv->cmd2 |= (CMD2_HWTRIG | CMD2_PRETRIG);
break;
case TRIG_COUNT:
case TRIG_NONE:
break;
default:
comedi_error(dev, "bug with stop_src");
spin_unlock_irqrestore(&dev->spinlock, flags);
return -1;
}
devpriv->write_byte(devpriv->cmd2, dev->iobase + CMD2_REG); devpriv->write_byte(devpriv->cmd2, dev->iobase + CMD2_REG);
spin_unlock_irqrestore(&dev->spinlock, flags); spin_unlock_irqrestore(&dev->spinlock, flags);
return 0; return 0;