From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 14 Oct 2014 17:44:44 +0000 (-0700)
Subject: staging: comedi: addi_apci_3120: remove boardinfo 'i_AiChannelList'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7fcf666b4a57b9317739f13a6a65d0dbecd47ca8;p=deliverable%2Flinux.git

staging: comedi: addi_apci_3120: remove boardinfo 'i_AiChannelList'

All boardinfo entries have this member set as '16'. This is also the Analog
Input 'n_chan'. For aesthetics, initialize the Analog Input 'len_chanlist'
with s->n_chan and remove the boardinfo member.

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/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 32e5ad487a1c..d555427d3359 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -16,7 +16,6 @@ enum apci3120_boardid {
 
 struct apci3120_board {
 	const char *name;
-	int i_AiChannelList;
 	int i_NbrAoChannel;
 	int i_AiMaxdata;
 	int i_AoMaxdata;
@@ -25,14 +24,12 @@ struct apci3120_board {
 static const struct apci3120_board apci3120_boardtypes[] = {
 	[BOARD_APCI3120] = {
 		.name			= "apci3120",
-		.i_AiChannelList	= 16,
 		.i_NbrAoChannel		= 8,
 		.i_AiMaxdata		= 0xffff,
 		.i_AoMaxdata		= 0x3fff,
 	},
 	[BOARD_APCI3001] = {
 		.name			= "apci3001",
-		.i_AiChannelList	= 16,
 		.i_AiMaxdata		= 0xfff,
 	},
 };
@@ -109,7 +106,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 		| SDF_DIFF;
 	s->n_chan = 16;
 	s->maxdata = this_board->i_AiMaxdata;
-	s->len_chanlist = this_board->i_AiChannelList;
+	s->len_chanlist = s->n_chan;
 	s->range_table = &range_apci3120_ai;
 
 	s->insn_config = apci3120_ai_insn_config;