diff options
author | Saber Rezvani <irsaber@gmail.com> | 2017-02-10 14:00:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-14 12:08:30 -0500 |
commit | 020883e5e5b9e4d724c997fef6e74c1d1b6256bf (patch) | |
tree | 6bb07f4a03912cab00b5d6dfced3b99f4018dd6c | |
parent | 16cc73893f7796a72f3e8b9c9ec524bb131de855 (diff) |
staging: comedi: ni_pcidio.c: Spaces preferred around operators
Fix the checkpatch.pl issue:
CHECK: spaces preferred around that '|' (ctx:VxV)
Signed-off-by: Saber Rezvani <irsaber@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_pcidio.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 4fb43f4f3cfb..b27345abebe1 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c | |||
@@ -65,7 +65,7 @@ | |||
65 | #define WindowAddressStatus_mask 0x7c | 65 | #define WindowAddressStatus_mask 0x7c |
66 | 66 | ||
67 | #define Master_DMA_And_Interrupt_Control 5 /* W */ | 67 | #define Master_DMA_And_Interrupt_Control 5 /* W */ |
68 | #define InterruptLine(x) ((x)&3) | 68 | #define InterruptLine(x) ((x) & 3) |
69 | #define OpenInt BIT(2) | 69 | #define OpenInt BIT(2) |
70 | #define Group_Status 5 /* R */ | 70 | #define Group_Status 5 /* R */ |
71 | #define DataLeft BIT(0) | 71 | #define DataLeft BIT(0) |
@@ -100,38 +100,38 @@ | |||
100 | #define Chip_ID_I 25 | 100 | #define Chip_ID_I 25 |
101 | #define Chip_ID_O 26 | 101 | #define Chip_ID_O 26 |
102 | #define Chip_Version 27 | 102 | #define Chip_Version 27 |
103 | #define Port_IO(x) (28+(x)) | 103 | #define Port_IO(x) (28 + (x)) |
104 | #define Port_Pin_Directions(x) (32+(x)) | 104 | #define Port_Pin_Directions(x) (32 + (x)) |
105 | #define Port_Pin_Mask(x) (36+(x)) | 105 | #define Port_Pin_Mask(x) (36 + (x)) |
106 | #define Port_Pin_Polarities(x) (40+(x)) | 106 | #define Port_Pin_Polarities(x) (40 + (x)) |
107 | 107 | ||
108 | #define Master_Clock_Routing 45 | 108 | #define Master_Clock_Routing 45 |
109 | #define RTSIClocking(x) (((x)&3)<<4) | 109 | #define RTSIClocking(x) (((x) & 3) << 4) |
110 | 110 | ||
111 | #define Group_1_Second_Clear 46 /* W */ | 111 | #define Group_1_Second_Clear 46 /* W */ |
112 | #define Group_2_Second_Clear 47 /* W */ | 112 | #define Group_2_Second_Clear 47 /* W */ |
113 | #define ClearExpired BIT(0) | 113 | #define ClearExpired BIT(0) |
114 | 114 | ||
115 | #define Port_Pattern(x) (48+(x)) | 115 | #define Port_Pattern(x) (48 + (x)) |
116 | 116 | ||
117 | #define Data_Path 64 | 117 | #define Data_Path 64 |
118 | #define FIFOEnableA BIT(0) | 118 | #define FIFOEnableA BIT(0) |
119 | #define FIFOEnableB BIT(1) | 119 | #define FIFOEnableB BIT(1) |
120 | #define FIFOEnableC BIT(2) | 120 | #define FIFOEnableC BIT(2) |
121 | #define FIFOEnableD BIT(3) | 121 | #define FIFOEnableD BIT(3) |
122 | #define Funneling(x) (((x)&3)<<4) | 122 | #define Funneling(x) (((x) & 3) << 4) |
123 | #define GroupDirection BIT(7) | 123 | #define GroupDirection BIT(7) |
124 | 124 | ||
125 | #define Protocol_Register_1 65 | 125 | #define Protocol_Register_1 65 |
126 | #define OpMode Protocol_Register_1 | 126 | #define OpMode Protocol_Register_1 |
127 | #define RunMode(x) ((x)&7) | 127 | #define RunMode(x) ((x) & 7) |
128 | #define Numbered BIT(3) | 128 | #define Numbered BIT(3) |
129 | 129 | ||
130 | #define Protocol_Register_2 66 | 130 | #define Protocol_Register_2 66 |
131 | #define ClockReg Protocol_Register_2 | 131 | #define ClockReg Protocol_Register_2 |
132 | #define ClockLine(x) (((x)&3)<<5) | 132 | #define ClockLine(x) (((x) & 3) << 5) |
133 | #define InvertStopTrig BIT(7) | 133 | #define InvertStopTrig BIT(7) |
134 | #define DataLatching(x) (((x)&3)<<5) | 134 | #define DataLatching(x) (((x) & 3) << 5) |
135 | 135 | ||
136 | #define Protocol_Register_3 67 | 136 | #define Protocol_Register_3 67 |
137 | #define Sequence Protocol_Register_3 | 137 | #define Sequence Protocol_Register_3 |
@@ -141,13 +141,13 @@ | |||
141 | 141 | ||
142 | #define Protocol_Register_4 70 | 142 | #define Protocol_Register_4 70 |
143 | #define ReqReg Protocol_Register_4 | 143 | #define ReqReg Protocol_Register_4 |
144 | #define ReqConditioning(x) (((x)&7)<<3) | 144 | #define ReqConditioning(x) (((x) & 7) << 3) |
145 | 145 | ||
146 | #define Protocol_Register_5 71 | 146 | #define Protocol_Register_5 71 |
147 | #define BlockMode Protocol_Register_5 | 147 | #define BlockMode Protocol_Register_5 |
148 | 148 | ||
149 | #define FIFO_Control 72 | 149 | #define FIFO_Control 72 |
150 | #define ReadyLevel(x) ((x)&7) | 150 | #define ReadyLevel(x) ((x) & 7) |
151 | 151 | ||
152 | #define Protocol_Register_6 73 | 152 | #define Protocol_Register_6 73 |
153 | #define LinePolarities Protocol_Register_6 | 153 | #define LinePolarities Protocol_Register_6 |
@@ -160,7 +160,7 @@ | |||
160 | 160 | ||
161 | #define Protocol_Register_7 74 | 161 | #define Protocol_Register_7 74 |
162 | #define AckSer Protocol_Register_7 | 162 | #define AckSer Protocol_Register_7 |
163 | #define AckLine(x) (((x)&3)<<2) | 163 | #define AckLine(x) (((x) & 3) << 2) |
164 | #define ExchangePins BIT(7) | 164 | #define ExchangePins BIT(7) |
165 | 165 | ||
166 | #define Interrupt_Control 75 | 166 | #define Interrupt_Control 75 |
@@ -180,15 +180,15 @@ static inline unsigned int secondary_DMAChannel_bits(unsigned int channel) | |||
180 | } | 180 | } |
181 | 181 | ||
182 | #define Transfer_Size_Control 77 | 182 | #define Transfer_Size_Control 77 |
183 | #define TransferWidth(x) ((x)&3) | 183 | #define TransferWidth(x) ((x) & 3) |
184 | #define TransferLength(x) (((x)&3)<<3) | 184 | #define TransferLength(x) (((x) & 3) << 3) |
185 | #define RequireRLevel BIT(5) | 185 | #define RequireRLevel BIT(5) |
186 | 186 | ||
187 | #define Protocol_Register_15 79 | 187 | #define Protocol_Register_15 79 |
188 | #define DAQOptions Protocol_Register_15 | 188 | #define DAQOptions Protocol_Register_15 |
189 | #define StartSource(x) ((x)&0x3) | 189 | #define StartSource(x) ((x) & 0x3) |
190 | #define InvertStart BIT(2) | 190 | #define InvertStart BIT(2) |
191 | #define StopSource(x) (((x)&0x3)<<3) | 191 | #define StopSource(x) (((x) & 0x3) << 3) |
192 | #define ReqStart BIT(6) | 192 | #define ReqStart BIT(6) |
193 | #define PreStart BIT(7) | 193 | #define PreStart BIT(7) |
194 | 194 | ||
@@ -255,9 +255,9 @@ enum FPGA_Control_Bits { | |||
255 | #define TIMER_BASE 50 /* nanoseconds */ | 255 | #define TIMER_BASE 50 /* nanoseconds */ |
256 | 256 | ||
257 | #ifdef USE_DMA | 257 | #ifdef USE_DMA |
258 | #define IntEn (CountExpired|Waited|PrimaryTC|SecondaryTC) | 258 | #define IntEn (CountExpired | Waited | PrimaryTC | SecondaryTC) |
259 | #else | 259 | #else |
260 | #define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC) | 260 | #define IntEn (TransferReady | CountExpired | Waited | PrimaryTC | SecondaryTC) |
261 | #endif | 261 | #endif |
262 | 262 | ||
263 | enum nidio_boardid { | 263 | enum nidio_boardid { |