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

index 578fd8920be1ed83991340fd13707cd7eaa588f6..d196343adb08b53fd96a0b0d7b24ffc21aefcf47 100644 (file)
@@ -806,7 +806,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
        char err = 1;
        unsigned int mask, timeout;
        struct comedi_device *dev = d;
-       struct comedi_subdevice *s = dev->subdevices + 0;
+       struct comedi_subdevice *s = &dev->subdevices[0];
        unsigned int next_chan;
 
        s->async->events = 0;
@@ -909,7 +909,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
 static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)
 {
        struct comedi_device *dev = d;
-       struct comedi_subdevice *s = dev->subdevices + 0;
+       struct comedi_subdevice *s = &dev->subdevices[0];
        unsigned long dma_flags;
        int len, bufptr;
        short *ptr;
@@ -1267,7 +1267,7 @@ no_dma:
 
        /* analog input */
        if (board->n_aichan > 0) {
-               s = dev->subdevices + subdev;
+               s = &dev->subdevices[subdev];
                s->type = COMEDI_SUBD_AI;
                s->subdev_flags = SDF_READABLE;
                switch (board->board_type) {
@@ -1409,7 +1409,7 @@ no_dma:
 
        /* analog output */
        if (board->n_aochan > 0) {
-               s = dev->subdevices + subdev;
+               s = &dev->subdevices[subdev];
                s->type = COMEDI_SUBD_AO;
                s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
                s->n_chan = board->n_aochan;
@@ -1438,7 +1438,7 @@ no_dma:
 
        /* digital input */
        if (board->n_dichan > 0) {
-               s = dev->subdevices + subdev;
+               s = &dev->subdevices[subdev];
                s->type = COMEDI_SUBD_DI;
                s->subdev_flags = SDF_READABLE;
                s->n_chan = board->n_dichan;
@@ -1451,7 +1451,7 @@ no_dma:
 
        /* digital output */
        if (board->n_dochan > 0) {
-               s = dev->subdevices + subdev;
+               s = &dev->subdevices[subdev];
                s->type = COMEDI_SUBD_DO;
                s->subdev_flags = SDF_WRITABLE;
                s->n_chan = board->n_dochan;