touchpad: Simplify tp_hysteresis

Once we get beyond the:

	if (abs(diff) <= margin)
		return center;

test, then diff is either > margin or < -margin, otherwise the test would
have triggered.

So the "return center + diff;" at the end will never be reached, and the
"else if (diff < -margin)" can be turned into a simple "else".

This commit does not just simplify tp_hysteresis, but (arguably more
important) also makes it clearer to the reader what it does.

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

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index ced92378b3912d40ab9ee1e708f86bb597aaf9a7..9e858f13aa3fd4cb94e28f51970601b4259816c0 100644 (file)
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -42,9 +42,8 @@ tp_hysteresis(int in, int center, int margin)
 
        if (diff > margin)
                return center + diff - margin;
-       else if (diff < -margin)
+       else
                return center + diff + margin;
-       return center + diff;
 }
 
 static double