[PATCH 10/46] staging: comedi: me4000: refactor 'ao_fifo' boardinfo

H Hartley Sweeten hsweeten at visionengravers.com
Tue Aug 4 17:57:39 UTC 2015


This member of the boardinfo is always '4' for the boards that have an
analog output FIFO. Covert it to a bit-field, 'has_ao_fifo', to save a
bit of space.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
---
 drivers/staging/comedi/drivers/me4000.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index a012917..94fdb8f 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -188,12 +188,12 @@ enum me4000_boardid {
 
 struct me4000_board {
 	const char *name;
-	int ao_fifo;
 	int ai_nchan;
 	int ai_sh_nchan;
 	unsigned int can_do_diff_ai:1;
 	unsigned int ex_trig_analog:1;
 	unsigned int has_ao:1;
+	unsigned int has_ao_fifo:1;
 	unsigned int has_counter:1;
 };
 
@@ -264,40 +264,40 @@ static const struct me4000_board me4000_boards[] = {
 	},
 	[BOARD_ME4680] = {
 		.name		= "ME-4680",
-		.ao_fifo	= 4,
 		.ai_nchan	= 32,
 		.can_do_diff_ai	= 1,
 		.ex_trig_analog	= 1,
 		.has_ao		= 1,
+		.has_ao_fifo	= 1,
 		.has_counter	= 1,
 	},
 	[BOARD_ME4680I] = {
 		.name		= "ME-4680i",
-		.ao_fifo	= 4,
 		.ai_nchan	= 32,
 		.can_do_diff_ai	= 1,
 		.ex_trig_analog	= 1,
 		.has_ao		= 1,
+		.has_ao_fifo	= 1,
 		.has_counter	= 1,
 	},
 	[BOARD_ME4680S] = {
 		.name		= "ME-4680s",
-		.ao_fifo	= 4,
 		.ai_nchan	= 32,
 		.ai_sh_nchan	= 8,
 		.can_do_diff_ai	= 1,
 		.ex_trig_analog	= 1,
 		.has_ao		= 1,
+		.has_ao_fifo	= 1,
 		.has_counter	= 1,
 	},
 	[BOARD_ME4680IS] = {
 		.name		= "ME-4680is",
-		.ao_fifo	= 4,
 		.ai_nchan	= 32,
 		.ai_sh_nchan	= 8,
 		.can_do_diff_ai	= 1,
 		.ex_trig_analog	= 1,
 		.has_ao		= 1,
+		.has_ao_fifo	= 1,
 		.has_counter	= 1,
 	},
 };
-- 
2.4.3



More information about the devel mailing list