shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-04 02:02:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: remove boardinfo 'i_NbrDoChannel'

Browse Source 
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2014-10-14 10:44:41 -07:00
committed by Greg Kroah-Hartman
parent 73fc3c6c05
commit 4241d6b82d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@@ -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;