summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-11-02 04:29:13 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-02 22:23:50 +0400
commit1ba296b95613d279e9bb6ec93420a42159074782 (patch)
tree5bb47644a3609f7aeb4fc946b3c68fdced01e259 /drivers
parent65fe75a627dee4fcf23c8872213e88a273d735ec (diff)
downloadlinux-1ba296b95613d279e9bb6ec93420a42159074782.tar.xz
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: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_3120.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 7a18f7a381aa..a2fe789f01ea 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -21,7 +21,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrAoChannel = 8,
.i_AiMaxdata = 0xffff,
.i_AoMaxdata = 0x3fff,
- .pr_AiRangelist = &range_apci3120_ai,
.pr_AoRangelist = &range_apci3120_ao,
.i_NbrDiChannel = 4,
.i_NbrDoChannel = 4,
@@ -39,7 +38,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16,
.i_AiMaxdata = 0xfff,
- .pr_AiRangelist = &range_apci3120_ai,
.i_NbrDiChannel = 4,
.i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f,
@@ -161,7 +159,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
}
s->maxdata = this_board->i_AiMaxdata;
s->len_chanlist = this_board->i_AiChannelList;
- s->range_table = this_board->pr_AiRangelist;
+ s->range_table = &range_apci3120_ai;
/* Set the initialisation flag */
devpriv->b_AiInitialisation = 1;