Re: [PATCH] Input: fix faulty XXinput_* calls

[Daniel Mack <daniel@caiaq.de>]

On Sat, Aug 14, 2010 at 11:52:13PM +0200, Geert Uytterhoeven wrote:
> On Thu, Aug 12, 2010 at 18:22, Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
> > 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 +-
> 
> Thanks, amijoy.c compiles now.
> 
> But hil_kbd.c still doesn't compile:
> 
> > 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))
> 
> error: implicit declaration of function ‘input_abs_max’.
> 
> And indeed, input_abs_max() does not exist, while hil_kbd.c has 4 callers.

Sorry about that. hil_kbd wasn't built on my system with an
allmodconfig, as I just got to know. Below is a fix for this unfortunate
trouble.

Thanks,
Daniel


>From d3ff4d85516d5361aad42e9edddf9b4a99bc3daf Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Tue, 17 Aug 2010 16:33:45 +0200
Subject: [PATCH] input: fix input_abs_get_max call sites

This is another search-and-replace mistake which I didn't notice as
hil_kbd.c was not built by "make allmodconfig" on my system. Sorry
for the trouble caused.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Dmitry Torokhov <dtor@mail.ru>
---
 drivers/input/keyboard/hil_kbd.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index dcc86b9..1ed0e97 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -234,11 +234,11 @@ static void hil_dev_handle_ptr_events(struct hil_dev *ptr)
 #ifdef TABLET_AUTOADJUST
 			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))
+			if (val > input_abs_get_max(dev, ABS_X + i))
 				input_abs_set_max(dev, ABS_X + i, val);
 #endif
 			if (i % 3)
-				val = input_abs_max(dev, ABS_X + i) - val;
+				val = input_abs_get_max(dev, ABS_X + i) - val;
 			input_report_abs(dev, ABS_X + i, val);
 		} else {
 			val = (int) (((int8_t) lo) | ((int8_t) hi << 8));
@@ -388,11 +388,11 @@ static void hil_dev_pointer_setup(struct hil_dev *ptr)
 
 #ifdef TABLET_AUTOADJUST
 		for (i = 0; i < ABS_MAX; i++) {
-			int diff = input_abs_max(input_dev, ABS_X + i) / 10;
+			int diff = input_abs_get_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)
 			input_abs_set_max(input_dev, ABS_X + i,
-				input_abs_max(input_dev, ABS_X + i) - diff)
+				input_abs_get_max(input_dev, ABS_X + i) - diff)
 		}
 #endif
 
-- 
1.7.1