diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-08-16 22:52:30 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-17 11:17:35 -0400 |
commit | accff3509e947a4c1f7c88aec7e41d14f6c6f51e (patch) | |
tree | 6a57ab79d9e0da896c0ef5682754cdcfefad6546 | |
parent | c8dd8e934087cc0ecf7033786ee00cff4ebcba4f (diff) |
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: | |||
105 | struct cb_pcimdda_board { | 105 | struct cb_pcimdda_board { |
106 | const char *name; | 106 | const char *name; |
107 | unsigned short device_id; | 107 | unsigned short device_id; |
108 | int ao_chans; | ||
109 | int ao_bits; | ||
110 | }; | 108 | }; |
111 | 109 | ||
112 | static const struct cb_pcimdda_board cb_pcimdda_boards[] = { | 110 | static const struct cb_pcimdda_board cb_pcimdda_boards[] = { |
113 | { | 111 | { |
114 | .name = "cb_pcimdda06-16", | 112 | .name = "cb_pcimdda06-16", |
115 | .device_id = PCI_ID_PCIM_DDA06_16, | 113 | .device_id = PCI_ID_PCIM_DDA06_16, |
116 | .ao_chans = 6, | ||
117 | .ao_bits = 16, | ||
118 | } | 114 | } |
119 | }; | 115 | }; |
120 | 116 | ||
@@ -258,8 +254,8 @@ static int cb_pcimdda_attach(struct comedi_device *dev, | |||
258 | /* analog output subdevice */ | 254 | /* analog output subdevice */ |
259 | s->type = COMEDI_SUBD_AO; | 255 | s->type = COMEDI_SUBD_AO; |
260 | s->subdev_flags = SDF_WRITABLE | SDF_READABLE; | 256 | s->subdev_flags = SDF_WRITABLE | SDF_READABLE; |
261 | s->n_chan = thisboard->ao_chans; | 257 | s->n_chan = 6; |
262 | s->maxdata = (1 << thisboard->ao_bits) - 1; | 258 | s->maxdata = 0xffff; |
263 | /* this is hard-coded here */ | 259 | /* this is hard-coded here */ |
264 | if (it->options[2]) | 260 | if (it->options[2]) |
265 | s->range_table = &range_bipolar10; | 261 | s->range_table = &range_bipolar10; |