diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2010-02-26 04:15:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:06 -0500 |
commit | 7c2f1946a5d41da3cfc1696944aaa420db5b5145 (patch) | |
tree | cf40788699d0038d0a4b20ec847351b6de9ecf03 /drivers/staging | |
parent | e3a21d0ac2ee4f6c1be5314e76939867a2d0b470 (diff) |
Staging: comedi: cb_pcimdas.c: Checkpatch cleanup
WARNING: braces {} are not necessary for any arm of this statement
+ if (thisboard->has_dio) {
[...]
+ } else {
[...]
WARNING: braces {} are not necessary for single statement blocks
+ if (devpriv->BADR0) {
+ 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_pcimdas.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c index cbbca05acb9..2e61727fc9a 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c | |||
@@ -330,11 +330,10 @@ found: | |||
330 | 330 | ||
331 | s = dev->subdevices + 2; | 331 | s = dev->subdevices + 2; |
332 | /* digital i/o subdevice */ | 332 | /* digital i/o subdevice */ |
333 | if (thisboard->has_dio) { | 333 | if (thisboard->has_dio) |
334 | subdev_8255_init(dev, s, NULL, devpriv->BADR4); | 334 | subdev_8255_init(dev, s, NULL, devpriv->BADR4); |
335 | } else { | 335 | else |
336 | s->type = COMEDI_SUBD_UNUSED; | 336 | s->type = COMEDI_SUBD_UNUSED; |
337 | } | ||
338 | 337 | ||
339 | printk("attached\n"); | 338 | printk("attached\n"); |
340 | 339 | ||
@@ -365,9 +364,8 @@ static int cb_pcimdas_detach(struct comedi_device *dev) | |||
365 | free_irq(dev->irq, dev); | 364 | free_irq(dev->irq, dev); |
366 | if (devpriv) { | 365 | if (devpriv) { |
367 | if (devpriv->pci_dev) { | 366 | if (devpriv->pci_dev) { |
368 | if (devpriv->BADR0) { | 367 | if (devpriv->BADR0) |
369 | comedi_pci_disable(devpriv->pci_dev); | 368 | comedi_pci_disable(devpriv->pci_dev); |
370 | } | ||
371 | pci_dev_put(devpriv->pci_dev); | 369 | pci_dev_put(devpriv->pci_dev); |
372 | } | 370 | } |
373 | } | 371 | } |