Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82ec595a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: cb_pcidda: remove subdevice pointer math 



Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4eb9523

drivers/staging/comedi/drivers/cb_pcidda.c

+5 −5
Original line number Diff line number Diff line
@@ -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;
@@ -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");
@@ -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)