From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 22 Mar 2016 18:10:46 +0000 (-0700)
Subject: staging: comedi: ni_660x: initialize the counter with the subdevice init
X-Git-Tag: v4.7-rc1~90^2~598
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90ad57be6be10e7084ca677d6eddfba612b55a62;p=karo-tx-linux.git

staging: comedi: ni_660x: initialize the counter with the subdevice init

Remove the extra for loop and just initialize the counter as the subdevices
are created.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 636630380100..5969723b6167 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1021,14 +1021,13 @@ static int ni_660x_auto_attach(struct comedi_device *dev,
 			s->buf_change	= ni_660x_buf_change;
 			s->async_dma_dir = DMA_BIDIRECTIONAL;
 			s->private	= counter;
+
+			ni_tio_init_counter(counter);
 		} else {
 			s->type		= COMEDI_SUBD_UNUSED;
 		}
 	}
 
-	for (i = 0; i < n_counters; ++i)
-		ni_tio_init_counter(&gpct_dev->counters[i]);
-
 	 /*
 	  * Default the DIO channels as:
 	  *   chan 0-7:  DIO inputs