staging: comedi: usbdux: remove subdevice pointer math

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>

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 11ee83681da7744fc7efdf2cd62063ed0c514311..7aac213fb6abdcddbea52d7a98be9bb23e59b893 100644 (file)
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -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;