]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcmad: change boardinfo 'n_ai_bits' to 'ai_maxdata'
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 5 Jun 2013 22:37:53 +0000 (15:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Jun 2013 19:01:34 +0000 (12:01 -0700)
This information is only used to set the subdevice 'maxdata'. Change
it so the calculation is not needed.

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>
drivers/staging/comedi/drivers/pcmad.c

index 76799ceac03317b81d120d108a4578654e310c13..94f50f69e4d80479d99cf785c41d4a6d19f1966f 100644 (file)
 
 struct pcmad_board_struct {
        const char *name;
-       int n_ai_bits;
+       unsigned int ai_maxdata;
 };
 
 static const struct pcmad_board_struct pcmad_boards[] = {
        {
                .name           = "pcmad12",
-               .n_ai_bits      = 12,
+               .ai_maxdata     = 0x0fff,
        }, {
                .name           = "pcmad16",
-               .n_ai_bits      = 16,
+               .ai_maxdata     = 0xffff,
        },
 };
 
@@ -137,7 +137,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        s->subdev_flags = SDF_READABLE | AREF_GROUND;
        s->n_chan       = 16;
        s->len_chanlist = 1;
-       s->maxdata      = (1 << board->n_ai_bits) - 1;
+       s->maxdata      = board->ai_maxdata;
        s->range_table  = &range_unknown;
        s->insn_read    = pcmad_ai_insn_read;