diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-05 18:32:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-05 20:03:53 -0700 |
| commit | 82ec595aa045e2efea7b0f2f50fe62cb82a88176 (patch) | |
| tree | c91247d379985bae07e855666adee710471e9d49 | |
| parent | e4eb9523efb89dc22f7db02df7495e89fac61416 (diff) | |
staging: comedi: cb_pcidda: remove subdevice pointer math
Convert the comedi_subdevice access from pointer math to array
access.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidda.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index c5944e383db6..ad9f3a3075a0 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c @@ -716,7 +716,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev, if (ret) return ret; - s = dev->subdevices + 0; + s = &dev->subdevices[0]; /* analog output subdevice */ s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE; @@ -730,9 +730,9 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev, /* s->do_cmdtest = cb_pcidda_ai_cmdtest; */ /* two 8255 digital io subdevices */ - s = dev->subdevices + 1; + s = &dev->subdevices[1]; subdev_8255_init(dev, s, NULL, devpriv->digitalio); - s = dev->subdevices + 2; + s = &dev->subdevices[2]; subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A); dev_dbg(dev->class_dev, "eeprom:\n"); @@ -756,8 +756,8 @@ static void cb_pcidda_detach(struct comedi_device *dev) struct pci_dev *pcidev = comedi_to_pci_dev(dev); if (dev->subdevices) { - subdev_8255_cleanup(dev, dev->subdevices + 1); - subdev_8255_cleanup(dev, dev->subdevices + 2); + subdev_8255_cleanup(dev, &dev->subdevices[1]); + subdev_8255_cleanup(dev, &dev->subdevices[2]); } if (pcidev) { if (dev->iobase) |