From 8ae90552f95f025ad09a17258d56603a424ca076 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 20 Apr 2011 15:30:19 +1000
Subject: [PATCH] dix: use single return statement in ApplySimpleSoftening

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
---
 dix/ptrveloc.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index 304a1c92e..98468bc8e 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -697,12 +697,13 @@ static inline float
 ApplySimpleSoftening(int prev_delta, int delta)
 {
     float result = delta;
-    if (delta <= 1 && delta >= -1)
-        return result;
-    if (delta > prev_delta)
-        result -= 0.5;
-    else if (delta < prev_delta)
-        result += 0.5;
+
+    if (delta < -1 || delta > 1) {
+	if (delta > prev_delta)
+	    result -= 0.5;
+	else if (delta < prev_delta)
+	    result += 0.5;
+    }
     return result;
 }