aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMaurice Dawson <mauricedawson2699@gmail.com>2010-10-07 14:45:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-07 17:42:43 -0400
commitbeb50909a748b25eb3118cbc2942442208fd9017 (patch)
tree510cd4236fd2224029eeb0b3d1db7c229de3d387 /drivers
parent960ea740a2c4f2da42fee2cdf7201ea6c477486c (diff)
Staging: comedi: file: Removed braces from some statement blocks
Unnecessary braces in some statement blocks Signed-off-by: Maurice Dawson <mauricedawson2699@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/adl_pci9118.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 3e2bb14e309..766103c882a 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -1575,12 +1575,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1575 } 1575 }
1576 1576
1577 /* use sample&hold signal? */ 1577 /* use sample&hold signal? */
1578 if (cmd->convert_src == TRIG_NOW) { 1578 if (cmd->convert_src == TRIG_NOW)
1579 devpriv->usessh = 1; 1579 devpriv->usessh = 1;
1580 } /* yes */ 1580 /* yes */
1581 else { 1581 else
1582 devpriv->usessh = 0; 1582 devpriv->usessh = 0;
1583 } /* no */ 1583 /* no */
1584 1584
1585 DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n", 1585 DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n",
1586 devpriv->ai_neverending, devpriv->ai_scans, devpriv->usessh, 1586 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)
1597 devpriv->usedma = 1; 1597 devpriv->usedma = 1;
1598 if ((cmd->flags & TRIG_WAKE_EOS) && 1598 if ((cmd->flags & TRIG_WAKE_EOS) &&
1599 (devpriv->ai_n_scanlen == 1)) { 1599 (devpriv->ai_n_scanlen == 1)) {
1600 if (cmd->convert_src == TRIG_NOW) { 1600 if (cmd->convert_src == TRIG_NOW)
1601 devpriv->ai_add_back = 1; 1601 devpriv->ai_add_back = 1;
1602 }
1603 if (cmd->convert_src == TRIG_TIMER) { 1602 if (cmd->convert_src == TRIG_TIMER) {
1604 devpriv->usedma = 0; 1603 devpriv->usedma = 0;
1605 /* 1604 /*
@@ -1694,11 +1693,10 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1694 (cmd->scan_begin_src == TRIG_INT)) && 1693 (cmd->scan_begin_src == TRIG_INT)) &&
1695 (cmd->convert_src == TRIG_TIMER)) { 1694 (cmd->convert_src == TRIG_TIMER)) {
1696 /* both timer is used for one time */ 1695 /* both timer is used for one time */
1697 if (cmd->scan_begin_src == TRIG_EXT) { 1696 if (cmd->scan_begin_src == TRIG_EXT)
1698 devpriv->ai_do = 4; 1697 devpriv->ai_do = 4;
1699 } else { 1698 else
1700 devpriv->ai_do = 1; 1699 devpriv->ai_do = 1;
1701 }
1702 pci9118_calc_divisors(devpriv->ai_do, dev, s, 1700 pci9118_calc_divisors(devpriv->ai_do, dev, s,
1703 &cmd->scan_begin_arg, &cmd->convert_arg, 1701 &cmd->scan_begin_arg, &cmd->convert_arg,
1704 devpriv->ai_flags, 1702 devpriv->ai_flags,
@@ -2212,11 +2210,10 @@ static int pci9118_attach(struct comedi_device *dev,
2212 2210
2213 opt_bus = it->options[0]; 2211 opt_bus = it->options[0];
2214 opt_slot = it->options[1]; 2212 opt_slot = it->options[1];
2215 if (it->options[3] & 1) { 2213 if (it->options[3] & 1)
2216 master = 0; /* user don't want use bus master */ 2214 master = 0; /* user don't want use bus master */
2217 } else { 2215 else
2218 master = 1; 2216 master = 1;
2219 }
2220 2217
2221 ret = alloc_private(dev, sizeof(struct pci9118_private)); 2218 ret = alloc_private(dev, sizeof(struct pci9118_private));
2222 if (ret < 0) { 2219 if (ret < 0) {