Skip to content

Commit

Permalink
staging: comedi: cb_pcimdda: remove subdevice pointer math
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent 13201d8 commit 6807d64
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/comedi/drivers/cb_pcimdda.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static int cb_pcimdda_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 | SDF_READABLE;
Expand All @@ -186,7 +186,7 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev,
s->insn_write = cb_pcimdda_ao_winsn;
s->insn_read = cb_pcimdda_ao_rinsn;

s = dev->subdevices + 1;
s = &dev->subdevices[1];
/* digital i/o subdevice */
ret = subdev_8255_init(dev, s, NULL,
dev->iobase + PCIMDDA_8255_BASE_REG);
Expand All @@ -203,7 +203,7 @@ static void cb_pcimdda_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[1]);
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);
Expand Down

0 comments on commit 6807d64

Please sign in to comment.