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

staging: comedi: dt2801: 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 52a07cde
...@@ -532,7 +532,7 @@ static int dt2801_dio_insn_bits(struct comedi_device *dev, ...@@ -532,7 +532,7 @@ static int dt2801_dio_insn_bits(struct comedi_device *dev,
{ {
int which = 0; int which = 0;
if (s == dev->subdevices + 3) if (s == &dev->subdevices[3])
which = 1; which = 1;
if (data[0]) { if (data[0]) {
...@@ -555,7 +555,7 @@ static int dt2801_dio_insn_config(struct comedi_device *dev, ...@@ -555,7 +555,7 @@ static int dt2801_dio_insn_config(struct comedi_device *dev,
{ {
int which = 0; int which = 0;
if (s == dev->subdevices + 3) if (s == &dev->subdevices[3])
which = 1; which = 1;
/* configure */ /* configure */
...@@ -636,7 +636,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -636,7 +636,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
dev->board_name = boardtype.name; dev->board_name = boardtype.name;
s = dev->subdevices + 0; s = &dev->subdevices[0];
/* ai subdevice */ /* ai subdevice */
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND; s->subdev_flags = SDF_READABLE | SDF_GROUND;
...@@ -652,7 +652,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -652,7 +652,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = ai_range_lkup(boardtype.adrangetype, it->options[3]); s->range_table = ai_range_lkup(boardtype.adrangetype, it->options[3]);
s->insn_read = dt2801_ai_insn_read; s->insn_read = dt2801_ai_insn_read;
s++; s = &dev->subdevices[1];
/* ao subdevice */ /* ao subdevice */
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
...@@ -664,7 +664,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -664,7 +664,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_read = dt2801_ao_insn_read; s->insn_read = dt2801_ao_insn_read;
s->insn_write = dt2801_ao_insn_write; s->insn_write = dt2801_ao_insn_write;
s++; s = &dev->subdevices[2];
/* 1st digital subdevice */ /* 1st digital subdevice */
s->type = COMEDI_SUBD_DIO; s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
...@@ -674,7 +674,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -674,7 +674,7 @@ static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_bits = dt2801_dio_insn_bits; s->insn_bits = dt2801_dio_insn_bits;
s->insn_config = dt2801_dio_insn_config; s->insn_config = dt2801_dio_insn_config;
s++; s = &dev->subdevices[3];
/* 2nd digital subdevice */ /* 2nd digital subdevice */
s->type = COMEDI_SUBD_DIO; s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
......
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