staging: comedi: ni_daq_dio24: remove subdevice pointer math
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 6 Sep 2012 01:49:34 +0000 (18:49 -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/ni_daq_dio24.c

index e27cae0eb8a2021b1fa0eb4efd9ce1c840f8bf4a..5f713c90d40186eb383a304bf53b06e74785773a 100644 (file)
@@ -164,7 +164,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                return ret;
 
        /* 8255 dio */
-       s = dev->subdevices + 0;
+       s = &dev->subdevices[0];
        subdev_8255_init(dev, s, NULL, dev->iobase);
 
        return 0;
@@ -172,8 +172,12 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void dio24_detach(struct comedi_device *dev)
 {
-       if (dev->subdevices)
-               subdev_8255_cleanup(dev, dev->subdevices + 0);
+       struct comedi_subdevice *s;
+
+       if (dev->subdevices) {
+               s = &dev->subdevices[0];
+               subdev_8255_cleanup(dev, s);
+       }
        if (thisboard->bustype != pcmcia_bustype && dev->iobase)
                release_region(dev->iobase, DIO24_SIZE);
        if (dev->irq)