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

staging: comedi: adl_pci9118: remove 'n_aichan' boardinfo

This member of the boardinfo is the same for all entries. Remove it.

Also, remove the initialization of the subdevice 'len_chanlist'. This
member is only used if the subdevice supports async commands.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12fa2fe1
...@@ -231,7 +231,6 @@ static const struct comedi_lrange range_pci9118hg = { ...@@ -231,7 +231,6 @@ static const struct comedi_lrange range_pci9118hg = {
struct boardtype { struct boardtype {
const char *name; /* board name */ const char *name; /* board name */
int device_id; /* PCI device ID of card */ int device_id; /* PCI device ID of card */
int n_aichan; /* num of A/D chans */
int ai_maxdata; /* resolution of A/D */ int ai_maxdata; /* resolution of A/D */
const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */ const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */
unsigned int ai_ns_min; /* max sample speed of card v ns */ unsigned int ai_ns_min; /* max sample speed of card v ns */
...@@ -245,7 +244,6 @@ static const struct boardtype boardtypes[] = { ...@@ -245,7 +244,6 @@ static const struct boardtype boardtypes[] = {
{ {
.name = "pci9118dg", .name = "pci9118dg",
.device_id = 0x80d9, .device_id = 0x80d9,
.n_aichan = 16,
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.rangelist_ai = &range_pci9118dg_hr, .rangelist_ai = &range_pci9118dg_hr,
.ai_ns_min = 3000, .ai_ns_min = 3000,
...@@ -253,7 +251,6 @@ static const struct boardtype boardtypes[] = { ...@@ -253,7 +251,6 @@ static const struct boardtype boardtypes[] = {
}, { }, {
.name = "pci9118hg", .name = "pci9118hg",
.device_id = 0x80d9, .device_id = 0x80d9,
.n_aichan = 16,
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.rangelist_ai = &range_pci9118hg, .rangelist_ai = &range_pci9118hg,
.ai_ns_min = 3000, .ai_ns_min = 3000,
...@@ -261,7 +258,6 @@ static const struct boardtype boardtypes[] = { ...@@ -261,7 +258,6 @@ static const struct boardtype boardtypes[] = {
}, { }, {
.name = "pci9118hr", .name = "pci9118hr",
.device_id = 0x80d9, .device_id = 0x80d9,
.n_aichan = 16,
.ai_maxdata = 0xffff, .ai_maxdata = 0xffff,
.rangelist_ai = &range_pci9118dg_hr, .rangelist_ai = &range_pci9118dg_hr,
.ai_ns_min = 10000, .ai_ns_min = 10000,
...@@ -1885,7 +1881,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq, ...@@ -1885,7 +1881,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
if (devpriv->usemux) if (devpriv->usemux)
s->n_chan = devpriv->usemux; s->n_chan = devpriv->usemux;
else else
s->n_chan = this_board->n_aichan; s->n_chan = 16;
s->maxdata = this_board->ai_maxdata; s->maxdata = this_board->ai_maxdata;
s->range_table = this_board->rangelist_ai; s->range_table = this_board->rangelist_ai;
......
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