aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2010-02-26 04:15:03 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 19:43:06 -0500
commitf1c54e82726fe51a55a18d15dc9377b8fd568ca2 (patch)
tree0c55dbebd2db460e2d493dee72dba7b34cb59877 /drivers/staging
parent7c2f1946a5d41da3cfc1696944aaa420db5b5145 (diff)
Staging: comedi: cb_pcimdda.c: Checkpatch cleanup
WARNING: braces {} are not necessary for any arm of this statement + if (it->options[2]) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->registers) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/cb_pcimdda.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 980fa0aacf9..e32a31763d5 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -284,11 +284,10 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
284 s->n_chan = thisboard->ao_chans; 284 s->n_chan = thisboard->ao_chans;
285 s->maxdata = figure_out_maxdata(thisboard->ao_bits); 285 s->maxdata = figure_out_maxdata(thisboard->ao_bits);
286 /* this is hard-coded here */ 286 /* this is hard-coded here */
287 if (it->options[2]) { 287 if (it->options[2])
288 s->range_table = &range_bipolar10; 288 s->range_table = &range_bipolar10;
289 } else { 289 else
290 s->range_table = &range_bipolar5; 290 s->range_table = &range_bipolar5;
291 }
292 s->insn_write = &ao_winsn; 291 s->insn_write = &ao_winsn;
293 s->insn_read = &ao_rinsn; 292 s->insn_read = &ao_rinsn;
294 293
@@ -337,9 +336,8 @@ static int detach(struct comedi_device *dev)
337 } 336 }
338 337
339 if (devpriv->pci_dev) { 338 if (devpriv->pci_dev) {
340 if (devpriv->registers) { 339 if (devpriv->registers)
341 comedi_pci_disable(devpriv->pci_dev); 340 comedi_pci_disable(devpriv->pci_dev);
342 }
343 pci_dev_put(devpriv->pci_dev); 341 pci_dev_put(devpriv->pci_dev);
344 } 342 }
345 343