Input: fix faulty XXinput_* calls

They've been introduced by 987a6c02 ("Input: switch to input_abs_*()
access functions") and they appear to be some kind of debug left-over.

[Dmitry Torokhov: these are my fault - I added XX prefixes in places where
 I wanted to do additional review of the code but failed to actually do
 that in these particular instances.]

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index e90694fe0d5ca33483ac1ba70cb5ef7e839d8f13..0bc86204213e187106c54c560774884ac632f09d 100644 (file)
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -139,7 +139,7 @@ static int __init amijoy_init(void)
                amijoy_dev[i]->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
                        BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
                for (j = 0; j < 2; j++) {
-                       XXinput_set_abs_params(amijoy_dev[i], ABS_X + j,
+                       input_set_abs_params(amijoy_dev[i], ABS_X + j,
                                             -1, 1, 0, 0);
                }
 

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index ddd5afd301d456013ff7abba410b104e2c6e8d9b..dcc86b97a1535c6a3ba098543d691ee249d56cf5 100644 (file)
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -235,7 +235,7 @@ static void hil_dev_handle_ptr_events(struct hil_dev *ptr)
                        if (val < input_abs_min(dev, ABS_X + i))
                                input_abs_set_min(dev, ABS_X + i, val);
                        if (val > input_abs_max(dev, ABS_X + i))
-                               XXinput_abs_set_max(dev, ABS_X + i, val);
+                               input_abs_set_max(dev, ABS_X + i, val);
 #endif
                        if (i % 3)
                                val = input_abs_max(dev, ABS_X + i) - val;
@@ -391,7 +391,7 @@ static void hil_dev_pointer_setup(struct hil_dev *ptr)
                        int diff = input_abs_max(input_dev, ABS_X + i) / 10;
                        input_abs_set_min(input_dev, ABS_X + i,
                                input_abs_min(input_dev, ABS_X + i) + diff)
-                       XXinput_abs_set_max(input_dev, ABS_X + i,
+                       input_abs_set_max(input_dev, ABS_X + i,
                                input_abs_max(input_dev, ABS_X + i) - diff)
                }
 #endif