Skip to content

Commit

Permalink
staging: comedi: cb_pcimdda: remove ao_chans and ao_bits from boardinfo
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Aug 17, 2012
1 parent c8dd8e9 commit accff35
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/staging/comedi/drivers/cb_pcimdda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
};

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit accff35

Please sign in to comment.