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: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/adl_pci9118.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 392afb5..3d25753 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -231,7 +231,6 @@ static const struct comedi_lrange range_pci9118hg = {
struct boardtype {
const char *name; /* board name */
int device_id; /* PCI device ID of card */
- int n_aichan; /* num of A/D chans */
int ai_maxdata; /* resolution of A/D */
const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */
unsigned int ai_ns_min; /* max sample speed of card v ns */
@@ -245,7 +244,6 @@ static const struct boardtype boardtypes[] = {
{
.name = "pci9118dg",
.device_id = 0x80d9,
- .n_aichan = 16,
.ai_maxdata = 0x0fff,
.rangelist_ai = &range_pci9118dg_hr,
.ai_ns_min = 3000,
@@ -253,7 +251,6 @@ static const struct boardtype boardtypes[] = {
}, {
.name = "pci9118hg",
.device_id = 0x80d9,
- .n_aichan = 16,
.ai_maxdata = 0x0fff,
.rangelist_ai = &range_pci9118hg,
.ai_ns_min = 3000,
@@ -261,7 +258,6 @@ static const struct boardtype boardtypes[] = {
}, {
.name = "pci9118hr",
.device_id = 0x80d9,
- .n_aichan = 16,
.ai_maxdata = 0xffff,
.rangelist_ai = &range_pci9118dg_hr,
.ai_ns_min = 10000,
@@ -1885,7 +1881,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
if (devpriv->usemux)
s->n_chan = devpriv->usemux;
else
- s->n_chan = this_board->n_aichan;
+ s->n_chan = 16;
s->maxdata = this_board->ai_maxdata;
s->range_table = this_board->rangelist_ai;
--
2.0.3
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
