diff options
| author | Alexander Gordeev <lasaine@lvk.cs.msu.su> | 2011-01-12 17:00:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 08:03:20 -0800 |
| commit | 818b9eefe742cc29c6456e163e2c035cfb431e51 (patch) | |
| tree | fb356eb09a75f6782a98fd37f5d6498a2df2b00e | |
| parent | 29f347c9faf53cfb953e4d529e6e632482214e62 (diff) | |
| download | linux-3.10-818b9eefe742cc29c6456e163e2c035cfb431e51.tar.gz linux-3.10-818b9eefe742cc29c6456e163e2c035cfb431e51.tar.bz2 linux-3.10-818b9eefe742cc29c6456e163e2c035cfb431e51.zip | |
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>
| -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 3e8eb3fb757..ebf33746c37 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, /* Check the event */ pps->current_mode = pps->params.mode; - if ((event & PPS_CAPTUREASSERT) & - (pps->params.mode & PPS_CAPTUREASSERT)) { + if (event & pps->params.mode & PPS_CAPTUREASSERT) { /* We have to add an offset? */ if (pps->params.mode & PPS_OFFSETASSERT) pps_add_offset(&ts_real, @@ -197,8 +196,7 @@ void pps_event(struct pps_device *pps, struct pps_event_time *ts, int event, captured = ~0; } - if ((event & PPS_CAPTURECLEAR) & - (pps->params.mode & PPS_CAPTURECLEAR)) { + if (event & pps->params.mode & PPS_CAPTURECLEAR) { /* We have to add an offset? */ if (pps->params.mode & PPS_OFFSETCLEAR) pps_add_offset(&ts_real, |