Skip to content

Commit

Permalink
staging: comedi: cb_pcidda: 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 e4eb952 commit 82ec595
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/comedi/drivers/cb_pcidda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand All @@ -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)
Expand Down

0 comments on commit 82ec595

Please sign in to comment.