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

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

staging: comedi: usbdux: 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 015ebbe8

drivers/staging/comedi/drivers/usbdux.c

+8 −8
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static void usbduxsub_ai_IsocIrq(struct urb *urb) 
	/* the private structure of the subdevice is struct usbduxsub */

	this_usbduxsub = this_comedidev->private;

	/* subdevice which is the AD converter */

	s = this_comedidev->subdevices + SUBDEV_AD;

	s = &this_comedidev->subdevices[SUBDEV_AD];



	/* first we test if something unusual has just happened */

	switch (urb->status) {
@@ -604,7 +604,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb) 
	/* the private structure of the subdevice is struct usbduxsub */

	this_usbduxsub = this_comedidev->private;



	s = this_comedidev->subdevices + SUBDEV_DA;

	s = &this_comedidev->subdevices[SUBDEV_DA];



	switch (urb->status) {

	case 0:
@@ -1947,7 +1947,7 @@ static void usbduxsub_pwm_irq(struct urb *urb) 
	/* the private structure of the subdevice is struct usbduxsub */

	this_usbduxsub = this_comedidev->private;



	s = this_comedidev->subdevices + SUBDEV_DA;

	s = &this_comedidev->subdevices[SUBDEV_DA];



	switch (urb->status) {

	case 0:
@@ -2331,7 +2331,7 @@ static int usbdux_attach_common(struct comedi_device *dev, 
	dev->private = udev;



	/* the first subdevice is the A/D converter */

	s = dev->subdevices + SUBDEV_AD;

	s = &dev->subdevices[SUBDEV_AD];

	/* the URBs get the comedi subdevice */

	/* which is responsible for reading */

	/* this is the subdevice which reads data */
@@ -2358,7 +2358,7 @@ static int usbdux_attach_common(struct comedi_device *dev, 
	s->range_table = (&range_usbdux_ai_range);



	/* analog out */

	s = dev->subdevices + SUBDEV_DA;

	s = &dev->subdevices[SUBDEV_DA];

	/* analog out */

	s->type = COMEDI_SUBD_AO;

	/* backward pointer */
@@ -2384,7 +2384,7 @@ static int usbdux_attach_common(struct comedi_device *dev, 
	s->insn_write = usbdux_ao_insn_write;



	/* digital I/O */

	s = dev->subdevices + SUBDEV_DIO;

	s = &dev->subdevices[SUBDEV_DIO];

	s->type = COMEDI_SUBD_DIO;

	s->subdev_flags = SDF_READABLE | SDF_WRITABLE;

	s->n_chan = 8;
@@ -2396,7 +2396,7 @@ static int usbdux_attach_common(struct comedi_device *dev, 
	s->private = NULL;



	/* counter */

	s = dev->subdevices + SUBDEV_COUNTER;

	s = &dev->subdevices[SUBDEV_COUNTER];

	s->type = COMEDI_SUBD_COUNTER;

	s->subdev_flags = SDF_WRITABLE | SDF_READABLE;

	s->n_chan = 4;
@@ -2407,7 +2407,7 @@ static int usbdux_attach_common(struct comedi_device *dev, 


	if (udev->high_speed) {

		/* timer / pwm */

		s = dev->subdevices + SUBDEV_PWM;

		s = &dev->subdevices[SUBDEV_PWM];

		s->type = COMEDI_SUBD_PWM;

		s->subdev_flags = SDF_WRITABLE | SDF_PWM_HBRIDGE;

		s->n_chan = 8;