HID: wacom: use WACOM_*_FIELD macros in wacom_usage_mapping()

We introduced nice macros in wacom_wac.c to check whether a field is
a pen or a touch one.

wacom_usage_mapping() still uses it's own tests, which are not in sync with
the wacom_wac tests (.application is not checked).

That means that some legitimate fields might be filtered out from the
usage mapping, and thus will not be used properly while receiving the
events.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 654202941d30..f01ab3a0c5f5 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -173,10 +173,8 @@ static void wacom_usage_mapping(struct hid_device *hdev,
 {
         struct wacom *wacom = hid_get_drvdata(hdev);
         struct wacom_features *features = &wacom->wacom_wac.features;
-        bool finger = (field->logical == HID_DG_FINGER) ||
-                      (field->physical == HID_DG_FINGER);
-        bool pen = (field->logical == HID_DG_STYLUS) ||
-                   (field->physical == HID_DG_STYLUS);
+        bool finger = WACOM_FINGER_FIELD(field);
+        bool pen = WACOM_PEN_FIELD(field);
 
         /*
         * Requiring Stylus Usage will ignore boot mouse