Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 02:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: cb_das16_cs: refactor 'n_ao_chans' boardinfo

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2015-10-12 16:07:06 -07:00 committed by Greg Kroah-Hartman
parent 6f2e618c3b
commit 1dbe3884bb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@ -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;