]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: comedi: fix brace coding style issue in das16m1.c
authorRavishankar karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Sat, 19 Nov 2011 04:36:39 +0000 (10:06 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 02:45:18 +0000 (18:45 -0800)
This is a patch to the das16m1.c file that fixes up a brace coding
warning found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/drivers/das16m1.c

index a5ce3b2abe4a7c0486cabe830d3c51ba81b28bb9..b8de37488b65eab9451b2be6557e715fc5fa780b 100644 (file)
@@ -384,20 +384,20 @@ static int das16m1_cmd_exec(struct comedi_device *dev,
        byte = 0;
        /* if we are using external start trigger (also board dislikes having
         * both start and conversion triggers external simultaneously) */
-       if (cmd->start_src == TRIG_EXT && cmd->convert_src != TRIG_EXT) {
+       if (cmd->start_src == TRIG_EXT && cmd->convert_src != TRIG_EXT)
                byte |= EXT_TRIG_BIT;
-       }
+
        outb(byte, dev->iobase + DAS16M1_CS);
        /* clear interrupt bit */
        outb(0, dev->iobase + DAS16M1_CLEAR_INTR);
 
        /* enable interrupts and internal pacer */
        devpriv->control_state &= ~PACER_MASK;
-       if (cmd->convert_src == TRIG_TIMER) {
+       if (cmd->convert_src == TRIG_TIMER)
                devpriv->control_state |= INT_PACER;
-       } else {
+       else
                devpriv->control_state |= EXT_PACER;
-       }
+
        devpriv->control_state |= INTE;
        outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL);
 
@@ -531,9 +531,8 @@ static void munge_sample_array(short *array, unsigned int num_elements)
 {
        unsigned int i;
 
-       for (i = 0; i < num_elements; i++) {
+       for (i = 0; i < num_elements; i++)
                array[i] = munge_sample(array[i]);
-       }
 }
 
 static void das16m1_handler(struct comedi_device *dev, unsigned int status)