]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: serial2002: remove subdevice pointer math
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 6 Sep 2012 01:57:21 +0000 (18:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Sep 2012 03:06:31 +0000 (20:06 -0700)
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>
drivers/staging/comedi/drivers/serial2002.c

index 0b58eec97f784a7e1d2f8113b19325a0ba868844..5bf84cfbdcebcb6715418ea132cce4ce1607bfd7 100644 (file)
@@ -800,7 +800,7 @@ static int serial2002_attach(struct comedi_device *dev,
                return ret;
 
        /* digital input subdevice */
-       s = dev->subdevices + 0;
+       s = &dev->subdevices[0];
        s->type = COMEDI_SUBD_DI;
        s->subdev_flags = SDF_READABLE;
        s->n_chan = 0;
@@ -809,7 +809,7 @@ static int serial2002_attach(struct comedi_device *dev,
        s->insn_read = &serial2002_di_rinsn;
 
        /* digital output subdevice */
-       s = dev->subdevices + 1;
+       s = &dev->subdevices[1];
        s->type = COMEDI_SUBD_DO;
        s->subdev_flags = SDF_WRITEABLE;
        s->n_chan = 0;
@@ -818,7 +818,7 @@ static int serial2002_attach(struct comedi_device *dev,
        s->insn_write = &serial2002_do_winsn;
 
        /* analog input subdevice */
-       s = dev->subdevices + 2;
+       s = &dev->subdevices[2];
        s->type = COMEDI_SUBD_AI;
        s->subdev_flags = SDF_READABLE | SDF_GROUND;
        s->n_chan = 0;
@@ -827,7 +827,7 @@ static int serial2002_attach(struct comedi_device *dev,
        s->insn_read = &serial2002_ai_rinsn;
 
        /* analog output subdevice */
-       s = dev->subdevices + 3;
+       s = &dev->subdevices[3];
        s->type = COMEDI_SUBD_AO;
        s->subdev_flags = SDF_WRITEABLE;
        s->n_chan = 0;
@@ -837,7 +837,7 @@ static int serial2002_attach(struct comedi_device *dev,
        s->insn_read = &serial2002_ao_rinsn;
 
        /* encoder input subdevice */
-       s = dev->subdevices + 4;
+       s = &dev->subdevices[4];
        s->type = COMEDI_SUBD_COUNTER;
        s->subdev_flags = SDF_READABLE | SDF_LSAMPL;
        s->n_chan = 0;