Commit beb50909 authored by Maurice Dawson's avatar Maurice Dawson Committed by Greg Kroah-Hartman

Staging: comedi: file: Removed braces from some statement blocks

Unnecessary braces in some statement blocks
Signed-off-by: default avatarMaurice Dawson <mauricedawson2699@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 960ea740
...@@ -1575,12 +1575,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1575,12 +1575,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
} }
/* use sample&hold signal? */ /* use sample&hold signal? */
if (cmd->convert_src == TRIG_NOW) { if (cmd->convert_src == TRIG_NOW)
devpriv->usessh = 1; devpriv->usessh = 1;
} /* yes */ /* yes */
else { else
devpriv->usessh = 0; devpriv->usessh = 0;
} /* no */ /* no */
DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n", DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n",
devpriv->ai_neverending, devpriv->ai_scans, devpriv->usessh, 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,9 +1597,8 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->usedma = 1; devpriv->usedma = 1;
if ((cmd->flags & TRIG_WAKE_EOS) && if ((cmd->flags & TRIG_WAKE_EOS) &&
(devpriv->ai_n_scanlen == 1)) { (devpriv->ai_n_scanlen == 1)) {
if (cmd->convert_src == TRIG_NOW) { if (cmd->convert_src == TRIG_NOW)
devpriv->ai_add_back = 1; devpriv->ai_add_back = 1;
}
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
devpriv->usedma = 0; devpriv->usedma = 0;
/* /*
...@@ -1694,11 +1693,10 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1694,11 +1693,10 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
(cmd->scan_begin_src == TRIG_INT)) && (cmd->scan_begin_src == TRIG_INT)) &&
(cmd->convert_src == TRIG_TIMER)) { (cmd->convert_src == TRIG_TIMER)) {
/* both timer is used for one time */ /* 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; devpriv->ai_do = 4;
} else { else
devpriv->ai_do = 1; devpriv->ai_do = 1;
}
pci9118_calc_divisors(devpriv->ai_do, dev, s, pci9118_calc_divisors(devpriv->ai_do, dev, s,
&cmd->scan_begin_arg, &cmd->convert_arg, &cmd->scan_begin_arg, &cmd->convert_arg,
devpriv->ai_flags, devpriv->ai_flags,
...@@ -2212,11 +2210,10 @@ static int pci9118_attach(struct comedi_device *dev, ...@@ -2212,11 +2210,10 @@ static int pci9118_attach(struct comedi_device *dev,
opt_bus = it->options[0]; opt_bus = it->options[0];
opt_slot = it->options[1]; opt_slot = it->options[1];
if (it->options[3] & 1) { if (it->options[3] & 1)
master = 0; /* user don't want use bus master */ master = 0; /* user don't want use bus master */
} else { else
master = 1; master = 1;
}
ret = alloc_private(dev, sizeof(struct pci9118_private)); ret = alloc_private(dev, sizeof(struct pci9118_private));
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment