[PATCH synaptics 1/6] eventcomm: drop superflous helper function

Peter Hutterer peter.hutterer at who-t.net
Tue Apr 8 18:47:12 PDT 2014


last_mt_vals_slot is only used in one location and there we can just use
cur_slot

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/eventcomm.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/eventcomm.c b/src/eventcomm.c
index 858efeb..5030150 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -110,16 +110,6 @@ EventProtoDataAlloc(int fd)
     return proto_data;
 }
 
-static int
-last_mt_vals_slot(const SynapticsPrivate * priv)
-{
-    struct eventcomm_proto_data *proto_data =
-        (struct eventcomm_proto_data *) priv->proto_data;
-    int value = proto_data->cur_slot;
-
-    return value < priv->num_slots ? value : -1;
-}
-
 static void
 UninitializeTouch(InputInfoPtr pInfo)
 {
@@ -549,7 +539,7 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct SynapticsHwState *hw,
         proto_data->cur_slot = ev->value;
     }
     else {
-        int slot_index = last_mt_vals_slot(priv);
+        int slot_index = proto_data->cur_slot;
 
         if (slot_index < 0)
             return;
-- 
1.9.0



More information about the xorg-devel mailing list