Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / staging / comedi / drivers / vmk80xx.c

diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 94010fc05905397d81b0703d6ae4e573ec3498e9..df277aa591bbae2b7fbe29899ca0c2fcd2d21461 100644 (file)
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -546,6 +546,7 @@ static int vmk80xx_ai_rinsn(struct comedi_device *cdev,
                        reg[0] = VMK8055_AI2_REG;
                break;
        case VMK8061_MODEL:
+       default:
                reg[0] = VMK8061_AI_REG1;
                reg[1] = VMK8061_AI_REG2;
                dev->usb_tx_buf[0] = VMK8061_CMD_RD_AI;
@@ -904,6 +905,7 @@ static int vmk80xx_cnt_rinsn(struct comedi_device *cdev,
                        reg[0] = VMK8055_CNT2_REG;
                break;
        case VMK8061_MODEL:
+       default:
                reg[0] = VMK8061_CNT_REG;
                reg[1] = VMK8061_CNT_REG;
                dev->usb_tx_buf[0] = VMK8061_CMD_RD_CNT;
@@ -1119,7 +1121,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 +1129,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 +1141,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 +1149,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 +1161,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 +1174,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;