All the boards supported by this driver have 32 dio channels.
Remove the boardinfo and just open code the value in the attach.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/me_daq.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index f14907e..6a8b2c9 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -182,7 +182,6 @@ struct me_board {
int ai_channel_nbr; /* AD config */
int ai_resolution;
const struct comedi_lrange *ai_range_list;
- int dio_channel_nbr; /* DIO config */
};
static const struct me_board me_boards[] = {
@@ -197,7 +196,6 @@ static const struct me_board me_boards[] = {
/* Analog Input */
.ai_resolution = 12,
.ai_range_list = &me2600_ai_range,
- .dio_channel_nbr = 32,
},
{
.name = "me-2000i",
@@ -206,7 +204,6 @@ static const struct me_board me_boards[] = {
/* Analog Input */
.ai_resolution = 12,
.ai_range_list = &me2000_ai_range,
- .dio_channel_nbr = 32,
}
};
@@ -741,9 +738,9 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
- s->n_chan = board->dio_channel_nbr;
+ s->n_chan = 32;
s->maxdata = 1;
- s->len_chanlist = board->dio_channel_nbr;
+ s->len_chanlist = 32;
s->range_table = &range_digital;
s->insn_bits = me_dio_insn_bits;
s->insn_config = me_dio_insn_config;
--
1.7.11
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
