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

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

staging: comedi: amplc_pci230: 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 e11c07fe

drivers/staging/comedi/drivers/amplc_pci230.c

+4 −4
Original line number Diff line number Diff line
@@ -2838,7 +2838,7 @@ static int pci230_attach_common(struct comedi_device *dev, 
	if (rc)

		return rc;



	s = dev->subdevices + 0;

	s = &dev->subdevices[0];

	/* analog input subdevice */

	s->type = COMEDI_SUBD_AI;

	s->subdev_flags = SDF_READABLE | SDF_DIFF | SDF_GROUND;
@@ -2855,7 +2855,7 @@ static int pci230_attach_common(struct comedi_device *dev, 
		s->do_cmdtest = &pci230_ai_cmdtest;

		s->cancel = pci230_ai_cancel;

	}

	s = dev->subdevices + 1;

	s = &dev->subdevices[1];

	/* analog output subdevice */

	if (thisboard->ao_chans > 0) {

		s->type = COMEDI_SUBD_AO;
@@ -2878,7 +2878,7 @@ static int pci230_attach_common(struct comedi_device *dev, 
	} else {

		s->type = COMEDI_SUBD_UNUSED;

	}

	s = dev->subdevices + 2;

	s = &dev->subdevices[2];

	/* digital i/o subdevice */

	if (thisboard->have_dio) {

		rc = subdev_8255_init(dev, s, NULL,
@@ -2941,7 +2941,7 @@ static void pci230_detach(struct comedi_device *dev) 
	struct pci_dev *pcidev = comedi_to_pci_dev(dev);



	if (dev->subdevices && thisboard->have_dio)

		subdev_8255_cleanup(dev, dev->subdevices + 2);

		subdev_8255_cleanup(dev, &dev->subdevices[2]);

	if (dev->irq)

		free_irq(dev->irq, dev);

	if (pcidev) {