The patch titled pps: simplify conditions a bit has been removed from the -mm tree. Its filename was pps-simplify-conditions-a-bit.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pps: simplify conditions a bit From: Alexander Gordeev <lasaine@xxxxxxxxxxxxx> Bitwise conjunction is distributive so we can simplify some conditions. Signed-off-by: Alexander Gordeev <lasaine@xxxxxxxxxxxxx> Acked-by: Rodolfo Giometti <giometti@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pps/kapi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/pps/kapi.c~pps-simplify-conditions-a-bit drivers/pps/kapi.c --- a/drivers/pps/kapi.c~pps-simplify-conditions-a-bit +++ a/drivers/pps/kapi.c @@ -182,8 +182,7 @@ void pps_event(struct pps_device *pps, s /* 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, s 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, _ Patches currently in -mm which might be from lasaine@xxxxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html