From 4241d6b82ddf080ce82f062281b93eb68c291298 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 14 Oct 2014 10:44:41 -0700 Subject: [PATCH] staging: comedi: addi_apci_3120: remove boardinfo 'i_NbrDoChannel' All boardinfo entries have this member set as '4'. Remove the member and initialize the Digial Output 'n_chan' with 4 directly. Also, remove the initialization of 'len_chanlist'. This member is only used with subdevices that support async commands. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi_apci_3120.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 9f5d7a5..fd6f64a 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -23,7 +23,6 @@ struct apci3120_board { int i_AiMaxdata; int i_AoMaxdata; int i_NbrDiChannel; - int i_NbrDoChannel; }; static const struct apci3120_board apci3120_boardtypes[] = { @@ -36,7 +35,6 @@ static const struct apci3120_board apci3120_boardtypes[] = { .i_AiMaxdata = 0xffff, .i_AoMaxdata = 0x3fff, .i_NbrDiChannel = 4, - .i_NbrDoChannel = 4, }, [BOARD_APCI3001] = { .name = "apci3001", @@ -45,7 +43,6 @@ static const struct apci3120_board apci3120_boardtypes[] = { .i_AiChannelList = 16, .i_AiMaxdata = 0xfff, .i_NbrDiChannel = 4, - .i_NbrDoChannel = 4, }, }; @@ -162,9 +159,8 @@ static int apci3120_auto_attach(struct comedi_device *dev, s->type = COMEDI_SUBD_DO; s->subdev_flags = SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = this_board->i_NbrDoChannel; + s->n_chan = 4; s->maxdata = 1; - s->len_chanlist = this_board->i_NbrDoChannel; s->range_table = &range_digital; s->insn_bits = apci3120_do_insn_bits; -- 2.7.4