diff options
| author | Jason Gerecke | 2015-12-01 02:13:52 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2015-12-02 21:44:52 +0100 |
| commit | 061099936a724cdd8dd0d69deea5b064b4f7122b (patch) | |
| tree | 13984f5b56ea10be89bdbf42a12289f71f4649d5 /drivers/hid/wacom_wac.c | |
| parent | HID: wacom: Clean up value reading (diff) | |
| download | kernel-qcow2-linux-061099936a724cdd8dd0d69deea5b064b4f7122b.tar.gz kernel-qcow2-linux-061099936a724cdd8dd0d69deea5b064b4f7122b.tar.xz kernel-qcow2-linux-061099936a724cdd8dd0d69deea5b064b4f7122b.zip | |
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>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 0008650e3bdb..3953416ff753 100644 --- 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 && |