diff options
author | Maurice Dawson <mauricedawson2699@googlemail.com> | 2010-02-19 05:53:15 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 10:59:01 -0500 |
commit | 65d6d26c6bcd802ebe2b22a29d9b6bbebfd8d7f8 (patch) | |
tree | ff97ff34faf4f8e2898ed114a1628d05ae22215b | |
parent | 2bb9c335902a5d59fc084170aaae0ccc9d9d4012 (diff) |
Staging: comedi: fix yet another brace coding style issue in ni_labpc.c
This is a patch to the ni_labpc.c file that fixes up all the brace
warnings found by the checkpatch.pl tool
Signed-off-by: Maurice Dawson <mauricedawson2699@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 5dc8606009aa..d6b5c05ee199 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -642,9 +642,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, | |||
642 | devpriv->eeprom_data[i] = labpc_eeprom_read(dev, i); | 642 | devpriv->eeprom_data[i] = labpc_eeprom_read(dev, i); |
643 | #ifdef LABPC_DEBUG | 643 | #ifdef LABPC_DEBUG |
644 | printk(" eeprom:"); | 644 | printk(" eeprom:"); |
645 | for (i = 0; i < EEPROM_SIZE; i++) { | 645 | for (i = 0; i < EEPROM_SIZE; i++) |
646 | printk(" %i:0x%x ", i, devpriv->eeprom_data[i]); | 646 | printk(" %i:0x%x ", i, devpriv->eeprom_data[i]); |
647 | } | ||
648 | printk("\n"); | 647 | printk("\n"); |
649 | #endif | 648 | #endif |
650 | } else | 649 | } else |
@@ -676,9 +675,8 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
676 | case pci_bustype: | 675 | case pci_bustype: |
677 | #ifdef CONFIG_COMEDI_PCI | 676 | #ifdef CONFIG_COMEDI_PCI |
678 | retval = labpc_find_device(dev, it->options[0], it->options[1]); | 677 | retval = labpc_find_device(dev, it->options[0], it->options[1]); |
679 | if (retval < 0) { | 678 | if (retval < 0) |
680 | return retval; | 679 | return retval; |
681 | } | ||
682 | retval = mite_setup(devpriv->mite); | 680 | retval = mite_setup(devpriv->mite); |
683 | if (retval < 0) | 681 | if (retval < 0) |
684 | return retval; | 682 | return retval; |
@@ -1005,9 +1003,9 @@ static int labpc_ai_cmdtest(struct comedi_device *dev, | |||
1005 | err++; | 1003 | err++; |
1006 | } | 1004 | } |
1007 | 1005 | ||
1008 | if (!cmd->chanlist_len) { | 1006 | if (!cmd->chanlist_len) |
1009 | err++; | 1007 | err++; |
1010 | } | 1008 | |
1011 | if (cmd->scan_end_arg != cmd->chanlist_len) { | 1009 | if (cmd->scan_end_arg != cmd->chanlist_len) { |
1012 | cmd->scan_end_arg = cmd->chanlist_len; | 1010 | cmd->scan_end_arg = cmd->chanlist_len; |
1013 | err++; | 1011 | err++; |
@@ -1102,9 +1100,9 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1102 | devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); | 1100 | devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); |
1103 | 1101 | ||
1104 | /* initialize software conversion count */ | 1102 | /* initialize software conversion count */ |
1105 | if (cmd->stop_src == TRIG_COUNT) { | 1103 | if (cmd->stop_src == TRIG_COUNT) |
1106 | devpriv->count = cmd->stop_arg * cmd->chanlist_len; | 1104 | devpriv->count = cmd->stop_arg * cmd->chanlist_len; |
1107 | } | 1105 | |
1108 | /* setup hardware conversion counter */ | 1106 | /* setup hardware conversion counter */ |
1109 | if (cmd->stop_src == TRIG_EXT) { | 1107 | if (cmd->stop_src == TRIG_EXT) { |
1110 | /* load counter a1 with count of 3 (pc+ manual says this is minimum allowed) using mode 0 */ | 1108 | /* load counter a1 with count of 3 (pc+ manual says this is minimum allowed) using mode 0 */ |
@@ -1476,9 +1474,9 @@ static void labpc_drain_dma(struct comedi_device *dev) | |||
1476 | } | 1474 | } |
1477 | 1475 | ||
1478 | /* write data to comedi buffer */ | 1476 | /* write data to comedi buffer */ |
1479 | for (i = 0; i < num_points; i++) { | 1477 | for (i = 0; i < num_points; i++) |
1480 | cfc_write_to_buffer(s, devpriv->dma_buffer[i]); | 1478 | cfc_write_to_buffer(s, devpriv->dma_buffer[i]); |
1481 | } | 1479 | |
1482 | if (async->cmd.stop_src == TRIG_COUNT) | 1480 | if (async->cmd.stop_src == TRIG_COUNT) |
1483 | devpriv->count -= num_points; | 1481 | devpriv->count -= num_points; |
1484 | 1482 | ||
@@ -1861,9 +1859,9 @@ static unsigned int labpc_serial_in(struct comedi_device *dev) | |||
1861 | udelay(1); | 1859 | udelay(1); |
1862 | devpriv->status2_bits = | 1860 | devpriv->status2_bits = |
1863 | devpriv->read_byte(dev->iobase + STATUS2_REG); | 1861 | devpriv->read_byte(dev->iobase + STATUS2_REG); |
1864 | if (devpriv->status2_bits & EEPROM_OUT_BIT) { | 1862 | if (devpriv->status2_bits & EEPROM_OUT_BIT) |
1865 | value |= 1 << (value_width - i); | 1863 | value |= 1 << (value_width - i); |
1866 | } | 1864 | |
1867 | } | 1865 | } |
1868 | 1866 | ||
1869 | return value; | 1867 | return value; |