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

staging: comedi: pcl818: remove 'sub_ai' from private data

This member of the private data is a duplicate of the comedi_device
'read_subdev' member. Remove the private data member and use the
comedi_device member instead.
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 5d788d01
...@@ -290,7 +290,6 @@ struct pcl818_private { ...@@ -290,7 +290,6 @@ struct pcl818_private {
unsigned int ai_data_len; /* len of data buffer */ unsigned int ai_data_len; /* len of data buffer */
unsigned int ai_timer1; /* timers */ unsigned int ai_timer1; /* timers */
unsigned int ai_timer2; unsigned int ai_timer2;
struct comedi_subdevice *sub_ai; /* ptr to AI subdevice */
unsigned char usefifo; /* 1=use fifo */ unsigned char usefifo; /* 1=use fifo */
unsigned int ao_readback[2]; unsigned int ao_readback[2];
}; };
...@@ -1269,7 +1268,6 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1269,7 +1268,6 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} else { } else {
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
devpriv->sub_ai = s;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
if (check_single_ended(dev->iobase)) { if (check_single_ended(dev->iobase)) {
s->n_chan = board->n_aichan_se; s->n_chan = board->n_aichan_se;
...@@ -1403,7 +1401,7 @@ static void pcl818_detach(struct comedi_device *dev) ...@@ -1403,7 +1401,7 @@ static void pcl818_detach(struct comedi_device *dev)
struct pcl818_private *devpriv = dev->private; struct pcl818_private *devpriv = dev->private;
if (devpriv) { if (devpriv) {
pcl818_ai_cancel(dev, devpriv->sub_ai); pcl818_ai_cancel(dev, dev->read_subdev);
pcl818_reset(dev); pcl818_reset(dev);
if (devpriv->dma) if (devpriv->dma)
free_dma(devpriv->dma); free_dma(devpriv->dma);
......
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