From 98ea9f854a2577b36e3a06d0824db5f51c514667 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 14 Oct 2014 10:44:43 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi_apci_3120.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 18e0b1367ce4..32e5ad487a1c 100644 --- 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; -- 2.30.2