Commit 1ba296b9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_3120: remove 'pr_AiRangelist'

Both boards supported by this driver have the same analog input
ranges. Remove the boardinfo for it and just init the subdevice
directly.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65fe75a6
...@@ -21,7 +21,6 @@ static const struct addi_board apci3120_boardtypes[] = { ...@@ -21,7 +21,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrAoChannel = 8, .i_NbrAoChannel = 8,
.i_AiMaxdata = 0xffff, .i_AiMaxdata = 0xffff,
.i_AoMaxdata = 0x3fff, .i_AoMaxdata = 0x3fff,
.pr_AiRangelist = &range_apci3120_ai,
.pr_AoRangelist = &range_apci3120_ao, .pr_AoRangelist = &range_apci3120_ao,
.i_NbrDiChannel = 4, .i_NbrDiChannel = 4,
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
...@@ -39,7 +38,6 @@ static const struct addi_board apci3120_boardtypes[] = { ...@@ -39,7 +38,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
.i_AiMaxdata = 0xfff, .i_AiMaxdata = 0xfff,
.pr_AiRangelist = &range_apci3120_ai,
.i_NbrDiChannel = 4, .i_NbrDiChannel = 4,
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
...@@ -161,7 +159,7 @@ static int apci3120_attach_pci(struct comedi_device *dev, ...@@ -161,7 +159,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
} }
s->maxdata = this_board->i_AiMaxdata; s->maxdata = this_board->i_AiMaxdata;
s->len_chanlist = this_board->i_AiChannelList; s->len_chanlist = this_board->i_AiChannelList;
s->range_table = this_board->pr_AiRangelist; s->range_table = &range_apci3120_ai;
/* Set the initialisation flag */ /* Set the initialisation flag */
devpriv->b_AiInitialisation = 1; devpriv->b_AiInitialisation = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment