提交 9b7beb66 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: das16m1: remove subdevice pointer math

Convert the comedi_subdevice access from pointer math to array
access.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 35d10629
...@@ -650,7 +650,7 @@ static int das16m1_attach(struct comedi_device *dev, ...@@ -650,7 +650,7 @@ static int das16m1_attach(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
s = dev->subdevices + 0; s = &dev->subdevices[0];
dev->read_subdev = s; dev->read_subdev = s;
/* ai */ /* ai */
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
...@@ -666,7 +666,7 @@ static int das16m1_attach(struct comedi_device *dev, ...@@ -666,7 +666,7 @@ static int das16m1_attach(struct comedi_device *dev,
s->cancel = das16m1_cancel; s->cancel = das16m1_cancel;
s->poll = das16m1_poll; s->poll = das16m1_poll;
s = dev->subdevices + 1; s = &dev->subdevices[1];
/* di */ /* di */
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
...@@ -675,7 +675,7 @@ static int das16m1_attach(struct comedi_device *dev, ...@@ -675,7 +675,7 @@ static int das16m1_attach(struct comedi_device *dev,
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_bits = das16m1_di_rbits; s->insn_bits = das16m1_di_rbits;
s = dev->subdevices + 2; s = &dev->subdevices[2];
/* do */ /* do */
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE | SDF_READABLE; s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
...@@ -684,7 +684,7 @@ static int das16m1_attach(struct comedi_device *dev, ...@@ -684,7 +684,7 @@ static int das16m1_attach(struct comedi_device *dev,
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_bits = das16m1_do_wbits; s->insn_bits = das16m1_do_wbits;
s = dev->subdevices + 3; s = &dev->subdevices[3];
/* 8255 */ /* 8255 */
subdev_8255_init(dev, s, NULL, dev->iobase + DAS16M1_82C55); subdev_8255_init(dev, s, NULL, dev->iobase + DAS16M1_82C55);
...@@ -707,7 +707,7 @@ static int das16m1_attach(struct comedi_device *dev, ...@@ -707,7 +707,7 @@ static int das16m1_attach(struct comedi_device *dev,
static void das16m1_detach(struct comedi_device *dev) static void das16m1_detach(struct comedi_device *dev)
{ {
if (dev->subdevices) if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 3); subdev_8255_cleanup(dev, &dev->subdevices[3]);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (dev->iobase) { if (dev->iobase) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册