staging: comedi: vmk80xx: 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/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 94010fc05905397d81b0703d6ae4e573ec3498e9..f9fef26db3aab38268241156d6d36956597d38a7 100644 (file)
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1119,7 +1119,7 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
                return ret;
        }
        /* Analog input subdevice */
-       s = cdev->subdevices + VMK80XX_SUBD_AI;
+       s = &cdev->subdevices[VMK80XX_SUBD_AI];
        s->type = COMEDI_SUBD_AI;
        s->subdev_flags = SDF_READABLE | SDF_GROUND;
        s->n_chan = dev->board.ai_chans;
@@ -1127,7 +1127,7 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
        s->range_table = dev->board.range;
        s->insn_read = vmk80xx_ai_rinsn;
        /* Analog output subdevice */
-       s = cdev->subdevices + VMK80XX_SUBD_AO;
+       s = &cdev->subdevices[VMK80XX_SUBD_AO];
        s->type = COMEDI_SUBD_AO;
        s->subdev_flags = SDF_WRITEABLE | SDF_GROUND;
        s->n_chan = dev->board.ao_chans;
@@ -1139,7 +1139,7 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
                s->insn_read = vmk80xx_ao_rinsn;
        }
        /* Digital input subdevice */
-       s = cdev->subdevices + VMK80XX_SUBD_DI;
+       s = &cdev->subdevices[VMK80XX_SUBD_DI];
        s->type = COMEDI_SUBD_DI;
        s->subdev_flags = SDF_READABLE | SDF_GROUND;
        s->n_chan = dev->board.di_chans;
@@ -1147,7 +1147,7 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
        s->insn_read = vmk80xx_di_rinsn;
        s->insn_bits = vmk80xx_di_bits;
        /* Digital output subdevice */
-       s = cdev->subdevices + VMK80XX_SUBD_DO;
+       s = &cdev->subdevices[VMK80XX_SUBD_DO];
        s->type = COMEDI_SUBD_DO;
        s->subdev_flags = SDF_WRITEABLE | SDF_GROUND;
        s->n_chan = dev->board.do_chans;
@@ -1159,7 +1159,7 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
                s->insn_read = vmk80xx_do_rinsn;
        }
        /* Counter subdevice */
-       s = cdev->subdevices + VMK80XX_SUBD_CNT;
+       s = &cdev->subdevices[VMK80XX_SUBD_CNT];
        s->type = COMEDI_SUBD_COUNTER;
        s->subdev_flags = SDF_READABLE;
        s->n_chan = dev->board.cnt_chans;
@@ -1172,7 +1172,7 @@ static int vmk80xx_attach_common(struct comedi_device *cdev,
        }
        /* PWM subdevice */
        if (dev->board.model == VMK8061_MODEL) {
-               s = cdev->subdevices + VMK80XX_SUBD_PWM;
+               s = &cdev->subdevices[VMK80XX_SUBD_PWM];
                s->type = COMEDI_SUBD_PWM;
                s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
                s->n_chan = dev->board.pwm_chans;