Commit 075eaef8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd8b1b8c
...@@ -214,7 +214,6 @@ static unsigned int pcl711_ai_get_sample(struct comedi_device *dev, ...@@ -214,7 +214,6 @@ static unsigned int pcl711_ai_get_sample(struct comedi_device *dev,
static irqreturn_t pcl711_interrupt(int irq, void *d) static irqreturn_t pcl711_interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
const struct pcl711_board *board = comedi_board(dev);
struct pcl711_private *devpriv = dev->private; struct pcl711_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev; struct comedi_subdevice *s = dev->read_subdev;
unsigned int data; unsigned int data;
...@@ -230,10 +229,7 @@ static irqreturn_t pcl711_interrupt(int irq, void *d) ...@@ -230,10 +229,7 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)
/* FIXME! Nothing else sets ntrig! */ /* FIXME! Nothing else sets ntrig! */
if (!(--devpriv->ntrig)) { if (!(--devpriv->ntrig)) {
if (board->is_8112) pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG);
pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG);
else
pcl711_ai_set_mode(dev, PCL711_MODE_DEFAULT);
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment