diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-10-12 16:07:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-13 10:26:19 -0700 |
| commit | 1dbe3884bbd041a4a9657df0de9d558e8335a3b6 (patch) | |
| tree | 5c8164596d29ac9d2362ea195472343935e601b7 /drivers/staging/comedi/drivers/cb_das16_cs.c | |
| parent | 6f2e618c3bd58d6d54e25564b25d18a7a332bd0a (diff) | |
staging: comedi: cb_das16_cs: refactor 'n_ao_chans' boardinfo
Only one of the boards supported by this driver has analog outputs.
For aesthetics, change the 'n_ao_chans' member of the boardinfo into
a bit-field flag 'has_ao'.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/cb_das16_cs.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_das16_cs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 7913a87a71e3..6f345089a5ee 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -99,22 +99,20 @@ struct das16cs_board { const char *name; int device_id; - int n_ao_chans; + unsigned int has_ao:1; }; static const struct das16cs_board das16cs_boards[] = { { .name = "PC-CARD DAS16/16-AO", .device_id = 0x0039, - .n_ao_chans = 2, + .has_ao = 1, }, { .name = "PCM-DAS16s/16", .device_id = 0x4009, - .n_ao_chans = 0, }, { .name = "PC-CARD DAS16/16", .device_id = 0x0000, /* unknown */ - .n_ao_chans = 0, }, }; @@ -357,10 +355,10 @@ static int das16cs_auto_attach(struct comedi_device *dev, s = &dev->subdevices[1]; /* analog output subdevice */ - if (board->n_ao_chans) { + if (board->has_ao) { s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE; - s->n_chan = board->n_ao_chans; + s->n_chan = 2; s->maxdata = 0xffff; s->range_table = &range_bipolar10; s->insn_write = &das16cs_ao_insn_write; |