touchpad: use ffs instead of a manual count

BTN_TOOL_FINGER, DOUBLETAP, etc. are mutually exclusive in the kernel, so we
can use ffs here instead of manually counting.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 406ac39ac73bd813975960204d1bd7842935d3dd..03d8d62ebbc264f16f7fb534e64a7488400fefa3 100644 (file)
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -138,17 +138,8 @@ tp_get_touch(struct tp_dispatch *tp, unsigned int slot)
 static inline unsigned int
 tp_fake_finger_count(struct tp_dispatch *tp)
 {
-       unsigned int fake_touches, nfake_touches;
-
        /* don't count BTN_TOUCH */
-       fake_touches = tp->fake_touches >> 1;
-       nfake_touches = 0;
-       while (fake_touches) {
-               nfake_touches++;
-               fake_touches >>= 1;
-       }
-
-       return nfake_touches;
+       return ffs(tp->fake_touches >> 1);
 }
 
 static inline bool