diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2010-02-26 04:15:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:05 -0500 |
commit | 20db7d7de7027ddee5df1b51b3d013568273b9df (patch) | |
tree | d725ebbb543ae29e1e88e49fb3772e82ae9caedb /drivers/staging | |
parent | 2d238b2972bf365153ae8d699177c7a19a5f3056 (diff) |
Staging: comedi: cb_pcidda.c: Checkpatch cleanup
WARNING: braces {} are not necessary for single statement blocks
+ if (devpriv->dac) {
+ comedi_pci_disable(devpriv->pci_dev);
+ }
WARNING: braces {} are not necessary for single statement blocks
+ if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT) {
+ value |= 1 << (value_width - i);
+ }
WARNING: braces {} are not necessary for single statement blocks
+ for (i = 0; i < max_num_caldacs; i++) {
+ cal2_bits |= DESELECT_CALDAC_BIT(i);
+ }
WARNING: braces {} are not necessary for single statement blocks
+ for (i = 0; i < max_num_caldacs; i++) {
+ cal2_bits |= DESELECT_CALDAC_BIT(i);
+ }
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_pcidda.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index 782357732ee..81829d6fd28 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c | |||
@@ -410,9 +410,8 @@ static int cb_pcidda_detach(struct comedi_device *dev) | |||
410 | */ | 410 | */ |
411 | if (devpriv) { | 411 | if (devpriv) { |
412 | if (devpriv->pci_dev) { | 412 | if (devpriv->pci_dev) { |
413 | if (devpriv->dac) { | 413 | if (devpriv->dac) |
414 | comedi_pci_disable(devpriv->pci_dev); | 414 | comedi_pci_disable(devpriv->pci_dev); |
415 | } | ||
416 | pci_dev_put(devpriv->pci_dev); | 415 | pci_dev_put(devpriv->pci_dev); |
417 | } | 416 | } |
418 | } | 417 | } |
@@ -677,9 +676,8 @@ static unsigned int cb_pcidda_serial_in(struct comedi_device *dev) | |||
677 | 676 | ||
678 | for (i = 1; i <= value_width; i++) { | 677 | for (i = 1; i <= value_width; i++) { |
679 | /* read bits most significant bit first */ | 678 | /* read bits most significant bit first */ |
680 | if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT) { | 679 | if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT) |
681 | value |= 1 << (value_width - i); | 680 | value |= 1 << (value_width - i); |
682 | } | ||
683 | } | 681 | } |
684 | 682 | ||
685 | return value; | 683 | return value; |
@@ -716,9 +714,8 @@ static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev, | |||
716 | /* send serial output stream to eeprom */ | 714 | /* send serial output stream to eeprom */ |
717 | cal2_bits = SELECT_EEPROM_BIT | DESELECT_REF_DAC_BIT | DUMMY_BIT; | 715 | cal2_bits = SELECT_EEPROM_BIT | DESELECT_REF_DAC_BIT | DUMMY_BIT; |
718 | /* deactivate caldacs (one caldac for every two channels) */ | 716 | /* deactivate caldacs (one caldac for every two channels) */ |
719 | for (i = 0; i < max_num_caldacs; i++) { | 717 | for (i = 0; i < max_num_caldacs; i++) |
720 | cal2_bits |= DESELECT_CALDAC_BIT(i); | 718 | cal2_bits |= DESELECT_CALDAC_BIT(i); |
721 | } | ||
722 | outw_p(cal2_bits, devpriv->dac + DACALIBRATION2); | 719 | outw_p(cal2_bits, devpriv->dac + DACALIBRATION2); |
723 | 720 | ||
724 | /* tell eeprom we want to read */ | 721 | /* tell eeprom we want to read */ |
@@ -756,9 +753,8 @@ static void cb_pcidda_write_caldac(struct comedi_device *dev, | |||
756 | */ | 753 | */ |
757 | cal2_bits = DESELECT_REF_DAC_BIT | DUMMY_BIT; | 754 | cal2_bits = DESELECT_REF_DAC_BIT | DUMMY_BIT; |
758 | /* deactivate caldacs (one caldac for every two channels) */ | 755 | /* deactivate caldacs (one caldac for every two channels) */ |
759 | for (i = 0; i < max_num_caldacs; i++) { | 756 | for (i = 0; i < max_num_caldacs; i++) |
760 | cal2_bits |= DESELECT_CALDAC_BIT(i); | 757 | cal2_bits |= DESELECT_CALDAC_BIT(i); |
761 | } | ||
762 | /* activate the caldac we want */ | 758 | /* activate the caldac we want */ |
763 | cal2_bits &= ~DESELECT_CALDAC_BIT(caldac); | 759 | cal2_bits &= ~DESELECT_CALDAC_BIT(caldac); |
764 | outw_p(cal2_bits, devpriv->dac + DACALIBRATION2); | 760 | outw_p(cal2_bits, devpriv->dac + DACALIBRATION2); |