From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 6 Sep 2012 01:45:45 +0000 (-0700)
Subject: staging: comedi: me_daq: remove subdevice pointer math
X-Git-Tag: next-20120907~17^2~51
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6e5602710ca71fd7084dc923c6ed22892df20c7;p=karo-tx-linux.git

staging: comedi: me_daq: remove subdevice pointer math

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>
---

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index b028eb853b0c..c68c407feb56 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -758,7 +758,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	if (error)
 		return error;
 
-	s = dev->subdevices + 0;
+	s = &dev->subdevices[0];
 	s->type = COMEDI_SUBD_AI;
 	s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ;
 	s->n_chan = board->ai_channel_nbr;
@@ -770,7 +770,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	s->do_cmdtest = me_ai_do_cmd_test;
 	s->do_cmd = me_ai_do_cmd;
 
-	s = dev->subdevices + 1;
+	s = &dev->subdevices[1];
 	s->type = COMEDI_SUBD_AO;
 	s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
 	s->n_chan = board->ao_channel_nbr;
@@ -780,7 +780,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	s->insn_read = me_ao_insn_read;
 	s->insn_write = me_ao_insn_write;
 
-	s = dev->subdevices + 2;
+	s = &dev->subdevices[2];
 	s->type = COMEDI_SUBD_DIO;
 	s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
 	s->n_chan = board->dio_channel_nbr;