Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 818b9eef authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Linus Torvalds
Browse files

pps: simplify conditions a bit 



Bitwise conjunction is distributive so we can simplify some conditions.

Signed-off-by: default avatarAlexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: default avatarRodolfo Giometti <giometti@linux.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 29f347c9

drivers/pps/kapi.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -182,8 +182,7 @@ void pps_event(struct pps_device *pps, struct pps_event_time *ts, int event, 




	/* Check the event */

	/* Check the event */

	pps->current_mode = pps->params.mode;

	pps->current_mode = pps->params.mode;

	if ((event & PPS_CAPTUREASSERT) &

	if (event & pps->params.mode & PPS_CAPTUREASSERT) {

			(pps->params.mode & PPS_CAPTUREASSERT)) {

		/* We have to add an offset? */

		/* We have to add an offset? */

		if (pps->params.mode & PPS_OFFSETASSERT)

		if (pps->params.mode & PPS_OFFSETASSERT)

			pps_add_offset(&ts_real,

			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;

		captured = ~0;

	}

	}

	if ((event & PPS_CAPTURECLEAR) &

	if (event & pps->params.mode & PPS_CAPTURECLEAR) {

			(pps->params.mode & PPS_CAPTURECLEAR)) {

		/* We have to add an offset? */

		/* We have to add an offset? */

		if (pps->params.mode & PPS_OFFSETCLEAR)

		if (pps->params.mode & PPS_OFFSETCLEAR)

			pps_add_offset(&ts_real,

			pps_add_offset(&ts_real,