evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: cb_pcidda: remove subdevice pointer math

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2012-09-05 18:32:23 -07:00 • committed by Greg Kroah-Hartman
parent e4eb9523ef
commit 82ec595aa0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/comedi/drivers/cb_pcidda.c
View file

@ -716,7 +716,7 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
s = dev->subdevices + 0; s = &dev->subdevices[0];
/* analog output subdevice */ /* analog output subdevice */
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE; 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; */ /* s->do_cmdtest = cb_pcidda_ai_cmdtest; */
/* two 8255 digital io subdevices */ /* two 8255 digital io subdevices */
s = dev->subdevices + 1; s = &dev->subdevices[1];
subdev_8255_init(dev, s, NULL, devpriv->digitalio); 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); subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A);
dev_dbg(dev->class_dev, "eeprom:\n"); 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); struct pci_dev *pcidev = comedi_to_pci_dev(dev);
if (dev->subdevices) { if (dev->subdevices) {
subdev_8255_cleanup(dev, dev->subdevices + 1); subdev_8255_cleanup(dev, &dev->subdevices[1]);
subdev_8255_cleanup(dev, dev->subdevices + 2); subdev_8255_cleanup(dev, &dev->subdevices[2]);
} }
if (pcidev) { if (pcidev) {
if (dev->iobase) if (dev->iobase)