Staging: comedi: file: Removed braces from some statement blocks
authorMaurice Dawson <mauricedawson2699@gmail.com>
Thu, 7 Oct 2010 18:45:38 +0000 (19:45 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 7 Oct 2010 21:42:43 +0000 (14:42 -0700)
Unnecessary braces in some statement blocks

Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/drivers/adl_pci9118.c

index 3e2bb14e3095d6bd8db3630a42dab3b6adce9e15..766103c882ad552959030685bad3984eca35418b 100644 (file)
@@ -1575,12 +1575,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        }
 
        /* use sample&hold signal? */
-       if (cmd->convert_src == TRIG_NOW) {
+       if (cmd->convert_src == TRIG_NOW)
                devpriv->usessh = 1;
-       /* yes */
-       else {
+       /* yes */
+       else
                devpriv->usessh = 0;
-       }                       /*  no */
+                               /*  no */
 
        DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n",
                devpriv->ai_neverending, devpriv->ai_scans, devpriv->usessh,
@@ -1597,9 +1597,8 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                devpriv->usedma = 1;
                if ((cmd->flags & TRIG_WAKE_EOS) &&
                    (devpriv->ai_n_scanlen == 1)) {
-                       if (cmd->convert_src == TRIG_NOW) {
+                       if (cmd->convert_src == TRIG_NOW)
                                devpriv->ai_add_back = 1;
-                       }
                        if (cmd->convert_src == TRIG_TIMER) {
                                devpriv->usedma = 0;
                                        /*
@@ -1694,11 +1693,10 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                (cmd->scan_begin_src == TRIG_INT)) &&
                (cmd->convert_src == TRIG_TIMER)) {
                                        /* both timer is used for one time */
-               if (cmd->scan_begin_src == TRIG_EXT) {
+               if (cmd->scan_begin_src == TRIG_EXT)
                        devpriv->ai_do = 4;
-               } else {
+               else
                        devpriv->ai_do = 1;
-               }
                pci9118_calc_divisors(devpriv->ai_do, dev, s,
                                      &cmd->scan_begin_arg, &cmd->convert_arg,
                                      devpriv->ai_flags,
@@ -2212,11 +2210,10 @@ static int pci9118_attach(struct comedi_device *dev,
 
        opt_bus = it->options[0];
        opt_slot = it->options[1];
-       if (it->options[3] & 1) {
+       if (it->options[3] & 1)
                master = 0;     /* user don't want use bus master */
-       } else {
+       else
                master = 1;
-       }
 
        ret = alloc_private(dev, sizeof(struct pci9118_private));
        if (ret < 0) {