diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-09-20 16:41:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 15:59:59 -0700 |
| commit | 075eaef87ee880dbfed2bd3a8ff0ece1b05cdacf (patch) | |
| tree | e083d5c4e4a5e536425ebd10d9a458d261ee051b /drivers/staging/comedi/drivers/pcl711.c | |
| parent | fd8b1b8c1632868f6be2c9edb5ddec8453b9b828 (diff) | |
staging: comedi: pcl711: remove unnecessary test of 'board->is_8112'
At the end of an asynchronous command, the analog input is returned
to software triggered mode. For the non-8112 style boards the mode
PCL711_MODE_DEFAULT and PCL711_MODE_SOFTTRIG are identical. Just set
the mode to PCL711_MODE_SOFTTRIG and remove the test.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/pcl711.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl711.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index 1d0e4444a52c..945e0bc111fb 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c @@ -214,7 +214,6 @@ static unsigned int pcl711_ai_get_sample(struct comedi_device *dev, static irqreturn_t pcl711_interrupt(int irq, void *d) { struct comedi_device *dev = d; - const struct pcl711_board *board = comedi_board(dev); struct pcl711_private *devpriv = dev->private; struct comedi_subdevice *s = dev->read_subdev; unsigned int data; @@ -230,10 +229,7 @@ static irqreturn_t pcl711_interrupt(int irq, void *d) /* FIXME! Nothing else sets ntrig! */ if (!(--devpriv->ntrig)) { - if (board->is_8112) - pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG); - else - pcl711_ai_set_mode(dev, PCL711_MODE_DEFAULT); + pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG); s->async->events |= COMEDI_CB_EOA; } |