diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2010-02-26 04:14:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:05 -0500 |
commit | 882e1233a1abb650149496b33eaeb1d09bbc0b7a (patch) | |
tree | cda8d1dd44c74052ac3d02bd36c597859d66d3e9 /drivers/staging | |
parent | a9ecb5bb5847b084d6d8bf5c60549fd5598c053a (diff) |
Staging: comedi: hwdrv_apci1032.c: Checkpatch cleanup
ERROR: do not initialise externals to 0 or NULL
+unsigned int ui_InterruptStatus = 0;
WARNING: braces {} are not necessary for single statement blocks
+ else {
+ outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
+ } /* else if(data[1] == ADDIDATA_OR) */
WARNING: braces {} are not necessary for single statement blocks
+ if (data[1] == 1) {
+ *data = ui_InterruptStatus;
+ } /* if(data[1]==1) */
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/addi-data/hwdrv_apci1032.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index 27c68aac32d1..fe06789699f3 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c | |||
@@ -54,7 +54,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour | |||
54 | #include "hwdrv_apci1032.h" | 54 | #include "hwdrv_apci1032.h" |
55 | #include <linux/delay.h> | 55 | #include <linux/delay.h> |
56 | /* Global variables */ | 56 | /* Global variables */ |
57 | unsigned int ui_InterruptStatus = 0; | 57 | unsigned int ui_InterruptStatus; |
58 | 58 | ||
59 | /* | 59 | /* |
60 | +----------------------------------------------------------------------------+ | 60 | +----------------------------------------------------------------------------+ |
@@ -108,9 +108,9 @@ int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subde | |||
108 | ui_TmpValue = | 108 | ui_TmpValue = |
109 | inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); | 109 | inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); |
110 | } /* if (data[1] == ADDIDATA_OR) */ | 110 | } /* if (data[1] == ADDIDATA_OR) */ |
111 | else { | 111 | else |
112 | outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); | 112 | outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); |
113 | } /* else if(data[1] == ADDIDATA_OR) */ | 113 | /* else if(data[1] == ADDIDATA_OR) */ |
114 | } /* if( data[0] == ADDIDATA_ENABLE) */ | 114 | } /* if( data[0] == ADDIDATA_ENABLE) */ |
115 | else { | 115 | else { |
116 | ul_Command1 = ul_Command1 & 0xFFFF0000; | 116 | ul_Command1 = ul_Command1 & 0xFFFF0000; |
@@ -221,9 +221,9 @@ int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub | |||
221 | } /* switch(ui_NoOfChannels) */ | 221 | } /* switch(ui_NoOfChannels) */ |
222 | } /* if(data[1]==0) */ | 222 | } /* if(data[1]==0) */ |
223 | else { | 223 | else { |
224 | if (data[1] == 1) { | 224 | if (data[1] == 1) |
225 | *data = ui_InterruptStatus; | 225 | *data = ui_InterruptStatus; |
226 | } /* if(data[1]==1) */ | 226 | /* if(data[1]==1) */ |
227 | } /* else if(data[1]==0) */ | 227 | } /* else if(data[1]==0) */ |
228 | return insn->n; | 228 | return insn->n; |
229 | } | 229 | } |