diff options
| author | Graham M Howe <gman.1352@googlemail.com> | 2010-02-09 18:42:25 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 10:59:00 -0500 |
| commit | c2ca6a476a2fde7239a576c1bde8d7cd2ded87a8 (patch) | |
| tree | b63002977b01eeb1fe7f9aa4d74c4cbb1ed245f8 /drivers | |
| parent | dedf3ad1534ff5e30a2eba88afe64bbe7beecfb6 (diff) | |
Staging: comedi: fix bracing coding style issue in ni_65xx.c
This is a patch to the ni_65xx.c file that fixes up a brace
warning found by the checkpatch.pl tool
Signed-off-by: Graham M Howe <gmhowe@btopenworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_65xx.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index bbf75eb6d7f2..dad79d5efec6 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c | |||
| @@ -26,12 +26,13 @@ | |||
| 26 | /* | 26 | /* |
| 27 | Driver: ni_65xx | 27 | Driver: ni_65xx |
| 28 | Description: National Instruments 65xx static dio boards | 28 | Description: National Instruments 65xx static dio boards |
| 29 | Author: Jon Grierson <jd@renko.co.uk>, Frank Mori Hess <fmhess@users.sourceforge.net> | 29 | Author: Jon Grierson <jd@renko.co.uk>, |
| 30 | Frank Mori Hess <fmhess@users.sourceforge.net> | ||
| 30 | Status: testing | 31 | Status: testing |
| 31 | Devices: [National Instruments] PCI-6509 (ni_65xx), PXI-6509, PCI-6510, PCI-6511, | 32 | Devices: [National Instruments] PCI-6509 (ni_65xx), PXI-6509, PCI-6510, |
| 32 | PXI-6511, PCI-6512, PXI-6512, PCI-6513, PXI-6513, PCI-6514, PXI-6514, PCI-6515, | 33 | PCI-6511, PXI-6511, PCI-6512, PXI-6512, PCI-6513, PXI-6513, PCI-6514, |
| 33 | PXI-6515, PCI-6516, PCI-6517, PCI-6518, PCI-6519, PCI-6520, PCI-6521, PXI-6521, | 34 | PXI-6514, PCI-6515, PXI-6515, PCI-6516, PCI-6517, PCI-6518, PCI-6519, |
| 34 | PCI-6528, PXI-6528 | 35 | PCI-6520, PCI-6521, PXI-6521, PCI-6528, PXI-6528 |
| 35 | Updated: Wed Oct 18 08:59:11 EDT 2006 | 36 | Updated: Wed Oct 18 08:59:11 EDT 2006 |
| 36 | 37 | ||
| 37 | Based on the PCI-6527 driver by ds. | 38 | Based on the PCI-6527 driver by ds. |
| @@ -418,7 +419,8 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev, | |||
| 418 | return -EINVAL; | 419 | return -EINVAL; |
| 419 | base_bitfield_channel = CR_CHAN(insn->chanspec); | 420 | base_bitfield_channel = CR_CHAN(insn->chanspec); |
| 420 | for (j = 0; j < max_ports_per_bitfield; ++j) { | 421 | for (j = 0; j < max_ports_per_bitfield; ++j) { |
| 421 | const unsigned port_offset = ni_65xx_port_by_channel(base_bitfield_channel) + j; | 422 | const unsigned port_offset = |
| 423 | ni_65xx_port_by_channel(base_bitfield_channel) + j; | ||
| 422 | const unsigned port = | 424 | const unsigned port = |
| 423 | sprivate(s)->base_port + port_offset; | 425 | sprivate(s)->base_port + port_offset; |
| 424 | unsigned base_port_channel; | 426 | unsigned base_port_channel; |
| @@ -463,11 +465,11 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev, | |||
| 463 | * subdevice.) */ | 465 | * subdevice.) */ |
| 464 | port_read_bits ^= 0xFF; | 466 | port_read_bits ^= 0xFF; |
| 465 | } | 467 | } |
| 466 | if (bitshift > 0) { | 468 | if (bitshift > 0) |
| 467 | port_read_bits <<= bitshift; | 469 | port_read_bits <<= bitshift; |
| 468 | } else { | 470 | else |
| 469 | port_read_bits >>= -bitshift; | 471 | port_read_bits >>= -bitshift; |
| 470 | } | 472 | |
| 471 | read_bits |= port_read_bits; | 473 | read_bits |= port_read_bits; |
| 472 | } | 474 | } |
| 473 | data[1] = read_bits; | 475 | data[1] = read_bits; |
| @@ -532,7 +534,8 @@ static int ni_65xx_intr_cmdtest(struct comedi_device *dev, | |||
| 532 | if (err) | 534 | if (err) |
| 533 | return 1; | 535 | return 1; |
| 534 | 536 | ||
| 535 | /* step 2: make sure trigger sources are unique and mutually compatible */ | 537 | /* step 2: make sure trigger sources are unique and mutually |
| 538 | compatible */ | ||
| 536 | 539 | ||
| 537 | if (err) | 540 | if (err) |
| 538 | return 2; | 541 | return 2; |
| @@ -790,9 +793,9 @@ static int ni_65xx_detach(struct comedi_device *dev) | |||
| 790 | Master_Interrupt_Control); | 793 | Master_Interrupt_Control); |
| 791 | } | 794 | } |
| 792 | 795 | ||
| 793 | if (dev->irq) { | 796 | if (dev->irq) |
| 794 | free_irq(dev->irq, dev); | 797 | free_irq(dev->irq, dev); |
| 795 | } | 798 | |
| 796 | 799 | ||
| 797 | if (private(dev)) { | 800 | if (private(dev)) { |
| 798 | unsigned i; | 801 | unsigned i; |
| @@ -802,9 +805,9 @@ static int ni_65xx_detach(struct comedi_device *dev) | |||
| 802 | dev->subdevices[i].private = NULL; | 805 | dev->subdevices[i].private = NULL; |
| 803 | } | 806 | } |
| 804 | } | 807 | } |
| 805 | if (private(dev)->mite) { | 808 | if (private(dev)->mite) |
| 806 | mite_unsetup(private(dev)->mite); | 809 | mite_unsetup(private(dev)->mite); |
| 807 | } | 810 | |
| 808 | } | 811 | } |
| 809 | return 0; | 812 | return 0; |
| 810 | } | 813 | } |
