From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Sat, 8 Sep 2012 00:39:31 +0000 (-0700)
Subject: staging: comedi: me4000: remove struct me4000_cnt_info
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eedf4299b5af712ee6f1db031308abe1a4dd7c82;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

staging: comedi: me4000: remove struct me4000_cnt_info

The me4000_cnt_info in the boardinfo struct is used to indicate
that the board has an 8254 counter. Add a 'has_counter' field
to struct me4000_board and remove the struct me4000_cnt_info.

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

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 1983fa724312..492b47e3fe76 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -84,9 +84,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4660i",
 		.device_id	= 0x4661,
@@ -97,9 +95,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4660s",
 		.device_id	= 0x4662,
@@ -111,9 +107,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4660is",
 		.device_id	= 0x4663,
@@ -125,9 +119,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4670",
 		.device_id	= 0x4670,
@@ -142,9 +134,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4670i",
 		.device_id	= 0x4671,
@@ -159,9 +149,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4670s",
 		.device_id	= 0x4672,
@@ -177,9 +165,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4670is",
 		.device_id	= 0x4673,
@@ -195,9 +181,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4680",
 		.device_id	= 0x4680,
@@ -213,9 +197,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4680i",
 		.device_id	= 0x4681,
@@ -231,9 +213,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4680s",
 		.device_id	= 0x4682,
@@ -250,9 +230,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	}, {
 		.name		= "ME-4680is",
 		.device_id	= 0x4683,
@@ -269,9 +247,7 @@ static const struct me4000_board me4000_boards[] = {
 		.dio		= {
 			.count		= 4,
 		},
-		.cnt		= {
-			.count		= 3,
-		},
+		.has_counter	= 1,
 	},
 };
 
@@ -2290,10 +2266,10 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	s = &dev->subdevices[3];
 
-	if (thisboard->cnt.count) {
+	if (thisboard->has_counter) {
 		s->type = COMEDI_SUBD_COUNTER;
 		s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
-		s->n_chan = thisboard->cnt.count;
+		s->n_chan = 3;
 		s->maxdata = 0xFFFF;	/*  16 bit counters */
 		s->insn_read = me4000_cnt_insn_read;
 		s->insn_write = me4000_cnt_insn_write;
diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 5a4df4e4b236..2b609d721d85 100644
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -272,17 +272,13 @@ struct me4000_dio_info {
 	int count;
 };
 
-struct me4000_cnt_info {
-	int count;
-};
-
 struct me4000_board {
 	const char *name;
 	unsigned short device_id;
 	struct me4000_ao_info ao;
 	struct me4000_ai_info ai;
 	struct me4000_dio_info dio;
-	struct me4000_cnt_info cnt;
+	int has_counter;
 };
 
 #define thisboard ((const struct me4000_board *)dev->board_ptr)