staging: comedi: addi_apci_3120: remove boardinfo 'i_NbrAiChannel'

All boardinfo entries have this member set as '16'. This will initialize
the Analog Input 'n_chan' and cause the 'i_NbrAiChannelDiff' member to
never get used. Remove both members and initialize the Analog Input 'n_chan'
with 16 directly.

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 18e0b1367ce4daaf01b0d6f89a7c18a3a51c7714..32e5ad487a1c4299122e668b1971174d435917f6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -16,8 +16,6 @@ enum apci3120_boardid {
 
 struct apci3120_board {
        const char *name;
-       int i_NbrAiChannel;
-       int i_NbrAiChannelDiff;
        int i_AiChannelList;
        int i_NbrAoChannel;
        int i_AiMaxdata;
@@ -27,8 +25,6 @@ struct apci3120_board {
 static const struct apci3120_board apci3120_boardtypes[] = {
        [BOARD_APCI3120] = {
                .name                   = "apci3120",
-               .i_NbrAiChannel         = 16,
-               .i_NbrAiChannelDiff     = 8,
                .i_AiChannelList        = 16,
                .i_NbrAoChannel         = 8,
                .i_AiMaxdata            = 0xffff,
@@ -36,8 +32,6 @@ static const struct apci3120_board apci3120_boardtypes[] = {
        },
        [BOARD_APCI3001] = {
                .name                   = "apci3001",
-               .i_NbrAiChannel         = 16,
-               .i_NbrAiChannelDiff     = 8,
                .i_AiChannelList        = 16,
                .i_AiMaxdata            = 0xfff,
        },
@@ -113,10 +107,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
        s->subdev_flags =
                SDF_READABLE | SDF_COMMON | SDF_GROUND
                | SDF_DIFF;
-       if (this_board->i_NbrAiChannel)
-               s->n_chan = this_board->i_NbrAiChannel;
-       else
-               s->n_chan = this_board->i_NbrAiChannelDiff;
+       s->n_chan = 16;
        s->maxdata = this_board->i_AiMaxdata;
        s->len_chanlist = this_board->i_AiChannelList;
        s->range_table = &range_apci3120_ai;