lkml.org 
[lkml]   [2010]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] Input: fix faulty XXinput_* calls
    From: Daniel Mack <daniel@caiaq.de>

    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>
    ---

    drivers/input/joystick/amijoy.c | 2 +-
    drivers/input/keyboard/hil_kbd.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)


    diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
    index e90694f..0bc8620 100644
    --- 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 ddd5afd..dcc86b9 100644
    --- 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
    --
    Dmitry

    \
     
     \ /
      Last update: 2010-08-12 18:25    [W:0.022 / U:0.900 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site