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

staging: comedi: pcl812: remove subdevice pointer math

Convert the comedi_subdevice access from pointer math to array
access.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dda841ff
...@@ -806,7 +806,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d) ...@@ -806,7 +806,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
char err = 1; char err = 1;
unsigned int mask, timeout; unsigned int mask, timeout;
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct comedi_subdevice *s = dev->subdevices + 0; struct comedi_subdevice *s = &dev->subdevices[0];
unsigned int next_chan; unsigned int next_chan;
s->async->events = 0; s->async->events = 0;
...@@ -909,7 +909,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev, ...@@ -909,7 +909,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d) static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct comedi_subdevice *s = dev->subdevices + 0; struct comedi_subdevice *s = &dev->subdevices[0];
unsigned long dma_flags; unsigned long dma_flags;
int len, bufptr; int len, bufptr;
short *ptr; short *ptr;
...@@ -1267,7 +1267,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1267,7 +1267,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* analog input */ /* analog input */
if (board->n_aichan > 0) { if (board->n_aichan > 0) {
s = dev->subdevices + subdev; s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
switch (board->board_type) { switch (board->board_type) {
...@@ -1409,7 +1409,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1409,7 +1409,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* analog output */ /* analog output */
if (board->n_aochan > 0) { if (board->n_aochan > 0) {
s = dev->subdevices + subdev; s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND; s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
s->n_chan = board->n_aochan; s->n_chan = board->n_aochan;
...@@ -1438,7 +1438,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1438,7 +1438,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* digital input */ /* digital input */
if (board->n_dichan > 0) { if (board->n_dichan > 0) {
s = dev->subdevices + subdev; s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
s->n_chan = board->n_dichan; s->n_chan = board->n_dichan;
...@@ -1451,7 +1451,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1451,7 +1451,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* digital output */ /* digital output */
if (board->n_dochan > 0) { if (board->n_dochan > 0) {
s = dev->subdevices + subdev; s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
s->n_chan = board->n_dochan; s->n_chan = board->n_dochan;
......
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