diff options
| author | Maurice Dawson <mauricedawson2699@gmail.com> | 2010-10-07 19:45:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 14:42:43 -0700 |
| commit | beb50909a748b25eb3118cbc2942442208fd9017 (patch) | |
| tree | 510cd4236fd2224029eeb0b3d1db7c229de3d387 /drivers/staging/comedi/drivers/adl_pci9118.c | |
| parent | 960ea740a2c4f2da42fee2cdf7201ea6c477486c (diff) | |
| download | kernel_samsung_smdk4412-beb50909a748b25eb3118cbc2942442208fd9017.zip kernel_samsung_smdk4412-beb50909a748b25eb3118cbc2942442208fd9017.tar.gz kernel_samsung_smdk4412-beb50909a748b25eb3118cbc2942442208fd9017.tar.bz2 | |
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/staging/comedi/drivers/adl_pci9118.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9118.c | 21 |
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 3e2bb14..766103c 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) } /* 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) { |