HID: wacom: Rename wacom ID report ID macros

"INTUOSREAD" and "INTUOSWRITE" are poorly named. These are report IDs
for pen ID (proximity) packets. It should be noted that the latter is
only used on Intuos/Intuos2 for a second stylus when DualTrack is in use.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 0008650e3bdb50db9261c6625783b3d42ebd62cf..3953416ff753b738fede1e8dd9377c363eec516d 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -443,7 +443,7 @@ static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac)
        struct hid_report_enum *re;
 
        re = &(wacom->hdev->report_enum[HID_FEATURE_REPORT]);
-       r = re->report_id_hash[WACOM_REPORT_INTUOSREAD];
+       r = re->report_id_hash[WACOM_REPORT_INTUOS_ID1];
        if (r) {
                hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT);
        }
@@ -1027,8 +1027,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
        int result;
 
        if (data[0] != WACOM_REPORT_PENABLED &&
-           data[0] != WACOM_REPORT_INTUOSREAD &&
-           data[0] != WACOM_REPORT_INTUOSWRITE &&
+           data[0] != WACOM_REPORT_INTUOS_ID1 &&
+           data[0] != WACOM_REPORT_INTUOS_ID2 &&
            data[0] != WACOM_REPORT_INTUOSPAD &&
            data[0] != WACOM_REPORT_INTUOS_PEN &&
            data[0] != WACOM_REPORT_CINTIQ &&

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 877c24a5df94ad5056983ca95c71bbe79588903f..3f60192e92726dd942b7b0a8f44d1e1ffc8d1e1d 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -47,8 +47,8 @@
 /* wacom data packet report IDs */
 #define WACOM_REPORT_PENABLED          2
 #define WACOM_REPORT_PENABLED_BT       3
-#define WACOM_REPORT_INTUOSREAD                5
-#define WACOM_REPORT_INTUOSWRITE       6
+#define WACOM_REPORT_INTUOS_ID1                5
+#define WACOM_REPORT_INTUOS_ID2                6
 #define WACOM_REPORT_INTUOSPAD         12
 #define WACOM_REPORT_INTUOS5PAD                3
 #define WACOM_REPORT_DTUSPAD           21