]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: cb_das16_cs: refactor 'n_ao_chans' boardinfo
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 12 Oct 2015 23:07:06 +0000 (16:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Oct 2015 17:26:19 +0000 (10:26 -0700)
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>
drivers/staging/comedi/drivers/cb_das16_cs.c

index 7913a87a71e3173ee57ae26ca4fd70f49a4d6fc4..6f345089a5ee022a256d0c054e736887e5e14f97 100644 (file)
 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;