Input: Use accessor for MT values

The current MT accessor function does not distinguish between the MT
values and the slot specification event. Add an accessor function for
the values only, and use it where appropriate.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1f78c957a75a4d284e34d04bf07145bb4014fb26..8921c6180c51dfe0efadeef0e7be59878aeca252 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -180,7 +180,7 @@ static int input_handle_abs_event(struct input_dev *dev,
                return INPUT_IGNORE_EVENT;
        }
 
-       is_mt_event = code >= ABS_MT_FIRST && code <= ABS_MT_LAST;
+       is_mt_event = input_is_mt_value(code);
 
        if (!is_mt_event) {
                pold = &dev->absinfo[code].value;

diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index 318bb82325a6fa59e4b3d9a13a17a99152dc5674..f86737586e190364a09c882afbab7890e66bde04 100644 (file)
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -48,10 +48,14 @@ static inline void input_mt_slot(struct input_dev *dev, int slot)
        input_event(dev, EV_ABS, ABS_MT_SLOT, slot);
 }
 
+static inline bool input_is_mt_value(int axis)
+{
+       return axis >= ABS_MT_FIRST && axis <= ABS_MT_LAST;
+}
+
 static inline bool input_is_mt_axis(int axis)
 {
-       return axis == ABS_MT_SLOT ||
-               (axis >= ABS_MT_FIRST && axis <= ABS_MT_LAST);
+       return axis == ABS_MT_SLOT || input_is_mt_value(axis);
 }
 
 void input_mt_report_slot_state(struct input_dev *dev,