diff options
Diffstat (limited to 'drivers/usb/input/wacom_wac.c')
-rw-r--r-- | drivers/usb/input/wacom_wac.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/input/wacom_wac.c b/drivers/usb/input/wacom_wac.c index 85d458c98b6e..aa31d22d4f05 100644 --- a/drivers/usb/input/wacom_wac.c +++ b/drivers/usb/input/wacom_wac.c | |||
@@ -20,7 +20,6 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom, void *wcombo) | |||
20 | 20 | ||
21 | switch (data[0]) { | 21 | switch (data[0]) { |
22 | case 1: | 22 | case 1: |
23 | wacom_input_regs(wcombo); | ||
24 | if (data[5] & 0x80) { | 23 | if (data[5] & 0x80) { |
25 | wacom->tool[0] = (data[5] & 0x20) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN; | 24 | wacom->tool[0] = (data[5] & 0x20) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN; |
26 | wacom->id[0] = (data[5] & 0x20) ? ERASER_DEVICE_ID : STYLUS_DEVICE_ID; | 25 | wacom->id[0] = (data[5] & 0x20) ? ERASER_DEVICE_ID : STYLUS_DEVICE_ID; |
@@ -39,7 +38,6 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom, void *wcombo) | |||
39 | } | 38 | } |
40 | break; | 39 | break; |
41 | case 2: | 40 | case 2: |
42 | wacom_input_regs(wcombo); | ||
43 | wacom_report_key(wcombo, BTN_TOOL_PEN, 1); | 41 | wacom_report_key(wcombo, BTN_TOOL_PEN, 1); |
44 | wacom_report_abs(wcombo, ABS_MISC, STYLUS_DEVICE_ID); /* report tool id */ | 42 | wacom_report_abs(wcombo, ABS_MISC, STYLUS_DEVICE_ID); /* report tool id */ |
45 | wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1])); | 43 | wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1])); |
@@ -67,8 +65,6 @@ static int wacom_pl_irq(struct wacom_wac *wacom, void *wcombo) | |||
67 | 65 | ||
68 | prox = data[1] & 0x40; | 66 | prox = data[1] & 0x40; |
69 | 67 | ||
70 | wacom_input_regs(wcombo); | ||
71 | |||
72 | id = ERASER_DEVICE_ID; | 68 | id = ERASER_DEVICE_ID; |
73 | if (prox) { | 69 | if (prox) { |
74 | 70 | ||
@@ -138,7 +134,6 @@ static int wacom_ptu_irq(struct wacom_wac *wacom, void *wcombo) | |||
138 | return 0; | 134 | return 0; |
139 | } | 135 | } |
140 | 136 | ||
141 | wacom_input_regs(wcombo); | ||
142 | if (data[1] & 0x04) { | 137 | if (data[1] & 0x04) { |
143 | wacom_report_key(wcombo, BTN_TOOL_RUBBER, data[1] & 0x20); | 138 | wacom_report_key(wcombo, BTN_TOOL_RUBBER, data[1] & 0x20); |
144 | wacom_report_key(wcombo, BTN_TOUCH, data[1] & 0x08); | 139 | wacom_report_key(wcombo, BTN_TOUCH, data[1] & 0x08); |
@@ -167,8 +162,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo) | |||
167 | return 0; | 162 | return 0; |
168 | } | 163 | } |
169 | 164 | ||
170 | wacom_input_regs(wcombo); | ||
171 | |||
172 | id = STYLUS_DEVICE_ID; | 165 | id = STYLUS_DEVICE_ID; |
173 | if (data[1] & 0x10) { /* in prox */ | 166 | if (data[1] & 0x10) { /* in prox */ |
174 | 167 | ||
@@ -369,8 +362,6 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) | |||
369 | return 0; | 362 | return 0; |
370 | } | 363 | } |
371 | 364 | ||
372 | wacom_input_regs(wcombo); | ||
373 | |||
374 | /* tool number */ | 365 | /* tool number */ |
375 | idx = data[1] & 0x01; | 366 | idx = data[1] & 0x01; |
376 | 367 | ||