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

staging: comedi: pcl818: use dev->read_subdev

Use the dev->read_subdev that was setup in the device attach instead
of accessing the dev->subdevices array directly.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89dac49e
...@@ -439,7 +439,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_int(int irq, void *d) ...@@ -439,7 +439,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_int(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct pcl818_private *devpriv = dev->private; struct pcl818_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[0]; struct comedi_subdevice *s = dev->read_subdev;
unsigned char low; unsigned char low;
int timeout = 50; /* wait max 50us */ int timeout = 50; /* wait max 50us */
...@@ -498,7 +498,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d) ...@@ -498,7 +498,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct pcl818_private *devpriv = dev->private; struct pcl818_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[0]; struct comedi_subdevice *s = dev->read_subdev;
int i, len, bufptr; int i, len, bufptr;
unsigned long flags; unsigned long flags;
unsigned short *ptr; unsigned short *ptr;
...@@ -575,7 +575,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d) ...@@ -575,7 +575,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct pcl818_private *devpriv = dev->private; struct pcl818_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[0]; struct comedi_subdevice *s = dev->read_subdev;
int i, len; int i, len;
unsigned char lo; unsigned char lo;
...@@ -667,10 +667,9 @@ static irqreturn_t interrupt_pcl818(int irq, void *d) ...@@ -667,10 +667,9 @@ static irqreturn_t interrupt_pcl818(int irq, void *d)
being reprogrammed while a DMA transfer is in being reprogrammed while a DMA transfer is in
progress. progress.
*/ */
struct comedi_subdevice *s = &dev->subdevices[0];
devpriv->ai_act_scan = 0; devpriv->ai_act_scan = 0;
devpriv->neverending_ai = 0; devpriv->neverending_ai = 0;
pcl818_ai_cancel(dev, s); pcl818_ai_cancel(dev, dev->read_subdev);
} }
outb(0, dev->iobase + PCL818_CLRINT); /* clear INT request */ outb(0, dev->iobase + PCL818_CLRINT); /* clear INT request */
......
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