]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: das1800: fix comments in das1800_ai_cmd()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Fri, 8 Apr 2016 19:42:00 +0000 (12:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Apr 2016 05:16:10 +0000 (22:16 -0700)
Fix the checkpatch.pl issues:
WARNING: Block comments use a trailing */ on a separate line
WARNING: line over 80 characters

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/das1800.c

index 3bfe0410838eccb22493b76782306f1c871813f9..42996cd9c9483456637b5db3a9ac0a5dcb0882f4 100644 (file)
@@ -833,8 +833,10 @@ static int das1800_ai_cmd(struct comedi_device *dev,
        const struct comedi_cmd *cmd = &async->cmd;
        unsigned int range0 = CR_RANGE(cmd->chanlist[0]);
 
-       /* disable dma on CMDF_WAKE_EOS, or CMDF_PRIORITY
-        * (because dma in handler is unsafe at hard real-time priority) */
+       /*
+        * Disable dma on CMDF_WAKE_EOS, or CMDF_PRIORITY (because dma in
+        * handler is unsafe at hard real-time priority).
+        */
        if (cmd->flags & (CMDF_WAKE_EOS | CMDF_PRIORITY))
                devpriv->irq_dma_bits &= ~DMA_ENABLED;
        else
@@ -897,14 +899,15 @@ static int das1800_ai_cmd(struct comedi_device *dev,
        outb(control_c, dev->iobase + DAS1800_CONTROL_C);
        /*  set conversion rate and length for burst mode */
        if (control_c & BMDE) {
-               /*  program conversion period with number of microseconds minus 1 */
-               outb(cmd->convert_arg / 1000 - 1,
+               outb(cmd->convert_arg / 1000 - 1,       /* microseconds - 1 */
                     dev->iobase + DAS1800_BURST_RATE);
                outb(cmd->chanlist_len - 1, dev->iobase + DAS1800_BURST_LENGTH);
        }
-       outb(devpriv->irq_dma_bits, dev->iobase + DAS1800_CONTROL_B);   /*  enable irq/dma */
-       outb(control_a, dev->iobase + DAS1800_CONTROL_A);       /* enable fifo and triggering */
-       outb(CVEN, dev->iobase + DAS1800_STATUS);       /* enable conversions */
+
+       /* enable and start conversions */
+       outb(devpriv->irq_dma_bits, dev->iobase + DAS1800_CONTROL_B);
+       outb(control_a, dev->iobase + DAS1800_CONTROL_A);
+       outb(CVEN, dev->iobase + DAS1800_STATUS);
 
        return 0;
 }