Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 77edf0c7515cd8268a0cce2daa3f3c87e9afe005

Authored by Dmitry Torokhov
1 parent 6ee9f4b4af
Exists in master and in 41 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb-lf-6.6.52-2.2.0-rc0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Input: hil_kbd - fix compile error 

Fix another compile breakage stemming from 987a6c02 ("Input: switch to
input_abs_*() access functions")

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

drivers/input/keyboard/hil_kbd.c
Diff comments   View file @ 77edf0c
... ... @@ -232,13 +232,13 @@
232 232 if (absdev) {
233 233 val = lo + (hi << 8);
234 234 #ifdef TABLET_AUTOADJUST
235   - if (val < input_abs_min(dev, ABS_X + i))
  235 + if (val < input_abs_get_min(dev, ABS_X + i))
236 236 input_abs_set_min(dev, ABS_X + i, val);
237   - if (val > input_abs_max(dev, ABS_X + i))
  237 + if (val > input_abs_get_max(dev, ABS_X + i))
238 238 input_abs_set_max(dev, ABS_X + i, val);
239 239 #endif
240 240 if (i % 3)
241   - val = input_abs_max(dev, ABS_X + i) - val;
  241 + val = input_abs_get_max(dev, ABS_X + i) - val;
242 242 input_report_abs(dev, ABS_X + i, val);
243 243 } else {
244 244 val = (int) (((int8_t) lo) | ((int8_t) hi << 8));
245 245  
246 246  
... ... @@ -388,11 +388,11 @@
388 388  
389 389 #ifdef TABLET_AUTOADJUST
390 390 for (i = 0; i < ABS_MAX; i++) {
391   - int diff = input_abs_max(input_dev, ABS_X + i) / 10;
  391 + int diff = input_abs_get_max(input_dev, ABS_X + i) / 10;
392 392 input_abs_set_min(input_dev, ABS_X + i,
393   - input_abs_min(input_dev, ABS_X + i) + diff)
  393 + input_abs_get_min(input_dev, ABS_X + i) + diff);
394 394 input_abs_set_max(input_dev, ABS_X + i,
395   - input_abs_max(input_dev, ABS_X + i) - diff)
  395 + input_abs_get_max(input_dev, ABS_X + i) - diff);
396 396 }
397 397 #endif
398 398