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>

diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index 3e8eb3fb7570cd2c97ca3345d4c5137f4fab5a5d..ebf33746c37ca4f0c4b35082df0479184e49c39c 100644 (file)
--- 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,