staging: comedi: pcl711: remove subdevice pointer math
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 6 Sep 2012 01:51:01 +0000 (18:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Sep 2012 03:06:29 +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/pcl711.c

index bb72d0bc2975e70ec3c2603e8723cff17db55fb5..ef77b15f19f7979d1072f82df114278fff69d6b6 100644 (file)
@@ -168,7 +168,7 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)
        int data;
        struct comedi_device *dev = d;
        const struct pcl711_board *board = comedi_board(dev);
-       struct comedi_subdevice *s = dev->subdevices + 0;
+       struct comedi_subdevice *s = &dev->subdevices[0];
 
        if (!dev->attached) {
                comedi_error(dev, "spurious interrupt");
@@ -520,7 +520,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (ret < 0)
                return ret;
 
-       s = dev->subdevices + 0;
+       s = &dev->subdevices[0];
        /* AI subdevice */
        s->type = COMEDI_SUBD_AI;
        s->subdev_flags = SDF_READABLE | SDF_GROUND;
@@ -536,7 +536,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                s->do_cmd = pcl711_ai_cmd;
        }
 
-       s++;
+       s = &dev->subdevices[1];
        /* AO subdevice */
        s->type = COMEDI_SUBD_AO;
        s->subdev_flags = SDF_WRITABLE;
@@ -547,7 +547,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        s->insn_write = pcl711_ao_insn;
        s->insn_read = pcl711_ao_insn_read;
 
-       s++;
+       s = &dev->subdevices[2];
        /* 16-bit digital input */
        s->type = COMEDI_SUBD_DI;
        s->subdev_flags = SDF_READABLE;
@@ -557,7 +557,7 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        s->range_table = &range_digital;
        s->insn_bits = pcl711_di_insn_bits;
 
-       s++;
+       s = &dev->subdevices[3];
        /* 16-bit digital out */
        s->type = COMEDI_SUBD_DO;
        s->subdev_flags = SDF_WRITABLE;