diff options
| author | H Hartley Sweeten | 2012-08-17 04:52:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-17 17:17:35 +0200 |
| commit | accff3509e947a4c1f7c88aec7e41d14f6c6f51e (patch) | |
| tree | 6a57ab79d9e0da896c0ef5682754cdcfefad6546 | |
| parent | staging: comedi: cb_pcimdda: remove regs_badrindex and reg_sz from boardinfo (diff) | |
| download | kernel-qcow2-linux-accff3509e947a4c1f7c88aec7e41d14f6c6f51e.tar.gz kernel-qcow2-linux-accff3509e947a4c1f7c88aec7e41d14f6c6f51e.tar.xz kernel-qcow2-linux-accff3509e947a4c1f7c88aec7e41d14f6c6f51e.zip | |
staging: comedi: cb_pcimdda: remove ao_chans and ao_bits from boardinfo
This board always has 6, 16-bit analog outputs. There is no need to carry
this information in the boardinfo. Remove it.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcimdda.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c index 0e346035d070..82fb5f6ff70e 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -105,16 +105,12 @@ Configuration Options: struct cb_pcimdda_board { const char *name; unsigned short device_id; - int ao_chans; - int ao_bits; }; static const struct cb_pcimdda_board cb_pcimdda_boards[] = { { .name = "cb_pcimdda06-16", .device_id = PCI_ID_PCIM_DDA06_16, - .ao_chans = 6, - .ao_bits = 16, } }; @@ -258,8 +254,8 @@ static int cb_pcimdda_attach(struct comedi_device *dev, /* analog output subdevice */ s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE | SDF_READABLE; - s->n_chan = thisboard->ao_chans; - s->maxdata = (1 << thisboard->ao_bits) - 1; + s->n_chan = 6; + s->maxdata = 0xffff; /* this is hard-coded here */ if (it->options[2]) s->range_table = &range_bipolar10; |