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

staging: comedi: cb_pcimdda: 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:33:19 -07:00 • committed by Greg Kroah-Hartman
parent 13201d8811
commit 6807d64d21
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/comedi/drivers/cb_pcimdda.c
View file

@ -176,7 +176,7 @@ static int cb_pcimdda_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 | SDF_READABLE; s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
@ -186,7 +186,7 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev,
s->insn_write = cb_pcimdda_ao_winsn; s->insn_write = cb_pcimdda_ao_winsn;
s->insn_read = cb_pcimdda_ao_rinsn; s->insn_read = cb_pcimdda_ao_rinsn;
s = dev->subdevices + 1; s = &dev->subdevices[1];
/* digital i/o subdevice */ /* digital i/o subdevice */
ret = subdev_8255_init(dev, s, NULL, ret = subdev_8255_init(dev, s, NULL,
dev->iobase + PCIMDDA_8255_BASE_REG); dev->iobase + PCIMDDA_8255_BASE_REG);
@ -203,7 +203,7 @@ static void cb_pcimdda_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]);
if (pcidev) { if (pcidev) {
if (dev->iobase) if (dev->iobase)
comedi_pci_disable(pcidev); comedi_pci_disable(pcidev);