]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: cb_das16_cs: tidy up analog input subdevice init
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 12 Oct 2015 23:07:07 +0000 (16:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Oct 2015 17:26:19 +0000 (10:26 -0700)
This driver currently code not support async commands. Remove the
SDF_CMD_READ subdev_flag and len_chanlist initialization from the
subdevice init.

For aesthetics, rename the (*insn_read) function.

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 6f345089a5ee022a256d0c054e736887e5e14f97..b3128efb2a0a7e55c7f886c44a8a9862bbe651b2 100644 (file)
@@ -143,9 +143,10 @@ static int das16cs_ai_eoc(struct comedi_device *dev,
        return -EBUSY;
 }
 
-static int das16cs_ai_rinsn(struct comedi_device *dev,
-                           struct comedi_subdevice *s,
-                           struct comedi_insn *insn, unsigned int *data)
+static int das16cs_ai_insn_read(struct comedi_device *dev,
+                               struct comedi_subdevice *s,
+                               struct comedi_insn *insn,
+                               unsigned int *data)
 {
        struct das16cs_private *devpriv = dev->private;
        int chan = CR_CHAN(insn->chanspec);
@@ -343,15 +344,14 @@ static int das16cs_auto_attach(struct comedi_device *dev,
        if (ret)
                return ret;
 
+       /* Analog Input subdevice */
        s = &dev->subdevices[0];
-       /* analog input subdevice */
        s->type         = COMEDI_SUBD_AI;
-       s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF | SDF_CMD_READ;
+       s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF;
        s->n_chan       = 16;
        s->maxdata      = 0xffff;
        s->range_table  = &das16cs_ai_range;
-       s->len_chanlist = 16;
-       s->insn_read    = das16cs_ai_rinsn;
+       s->insn_read    = das16cs_ai_insn_read;
 
        s = &dev->subdevices[1];
        /* analog output subdevice */