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

staging: comedi: daqboard2000: 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:34:59 -07:00 • committed by Greg Kroah-Hartman
parent b31654fe4b
commit b815357776
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/daqboard2000.c
View file

@ -804,7 +804,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
dev->board_name = this_board->name; dev->board_name = this_board->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;
@ -813,7 +813,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
s->insn_read = daqboard2000_ai_insn_read; s->insn_read = daqboard2000_ai_insn_read;
s->range_table = &range_daqboard2000_ai; s->range_table = &range_daqboard2000_ai;
s = dev->subdevices + 1; 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;
@ -823,7 +823,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
s->insn_write = daqboard2000_ao_insn_write; s->insn_write = daqboard2000_ao_insn_write;
s->range_table = &range_daqboard2000_ao; s->range_table = &range_daqboard2000_ao;
s = dev->subdevices + 2; s = &dev->subdevices[2];
result = subdev_8255_init(dev, s, daqboard2000_8255_cb, result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
(unsigned long)(devpriv->daq + 0x40)); (unsigned long)(devpriv->daq + 0x40));
@ -836,7 +836,7 @@ static void daqboard2000_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 + 2); subdev_8255_cleanup(dev, &dev->subdevices[2]);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (devpriv) { if (devpriv) {