diff options
author | Alexander Gordeev <lasaine@lvk.cs.msu.su> | 2011-01-12 20:00:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:20 -0500 |
commit | 818b9eefe742cc29c6456e163e2c035cfb431e51 (patch) | |
tree | fb356eb09a75f6782a98fd37f5d6498a2df2b00e /drivers | |
parent | 29f347c9faf53cfb953e4d529e6e632482214e62 (diff) |
pps: simplify conditions a bit
Bitwise conjunction is distributive so we can simplify some conditions.
Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pps/kapi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c index 3e8eb3fb7570..ebf33746c37c 100644 --- a/drivers/pps/kapi.c +++ b/drivers/pps/kapi.c | |||
@@ -182,8 +182,7 @@ void pps_event(struct pps_device *pps, struct pps_event_time *ts, int event, | |||
182 | 182 | ||
183 | /* Check the event */ | 183 | /* Check the event */ |
184 | pps->current_mode = pps->params.mode; | 184 | pps->current_mode = pps->params.mode; |
185 | if ((event & PPS_CAPTUREASSERT) & | 185 | if (event & pps->params.mode & PPS_CAPTUREASSERT) { |
186 | (pps->params.mode & PPS_CAPTUREASSERT)) { | ||
187 | /* We have to add an offset? */ | 186 | /* We have to add an offset? */ |
188 | if (pps->params.mode & PPS_OFFSETASSERT) | 187 | if (pps->params.mode & PPS_OFFSETASSERT) |
189 | pps_add_offset(&ts_real, | 188 | pps_add_offset(&ts_real, |
@@ -197,8 +196,7 @@ void pps_event(struct pps_device *pps, struct pps_event_time *ts, int event, | |||
197 | 196 | ||
198 | captured = ~0; | 197 | captured = ~0; |
199 | } | 198 | } |
200 | if ((event & PPS_CAPTURECLEAR) & | 199 | if (event & pps->params.mode & PPS_CAPTURECLEAR) { |
201 | (pps->params.mode & PPS_CAPTURECLEAR)) { | ||
202 | /* We have to add an offset? */ | 200 | /* We have to add an offset? */ |
203 | if (pps->params.mode & PPS_OFFSETCLEAR) | 201 | if (pps->params.mode & PPS_OFFSETCLEAR) |
204 | pps_add_offset(&ts_real, | 202 | pps_add_offset(&ts_real, |