From: H Hartley Sweeten Date: Thu, 6 Sep 2012 01:49:34 +0000 (-0700) Subject: staging: comedi: ni_daq_dio24: remove subdevice pointer math X-Git-Tag: next-20120907~17^2~39 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06e915e2ac55afb4989da4fb212150aa67a369ca;p=karo-tx-linux.git staging: comedi: ni_daq_dio24: remove subdevice pointer math Convert the comedi_subdevice access from pointer math to array access. Signed-off-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index e27cae0eb8a2..5f713c90d401 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -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)