diff mbox

[1/3] psmouse: Remove hardcoded touchpad size from the focaltech driver.

Message ID 1423940502-12353-2-git-send-email-mgottschlag@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mathias Gottschlag Feb. 14, 2015, 7:01 p.m. UTC
The size has in most cases already been fetched from the touchpad, the
hardcoded values should have been removed.

Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
---
 drivers/input/mouse/focaltech.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Dmitry Torokhov Feb. 18, 2015, 7:57 p.m. UTC | #1
On Sat, Feb 14, 2015 at 08:01:40PM +0100, Mathias Gottschlag wrote:
> The size has in most cases already been fetched from the touchpad, the
> hardcoded values should have been removed.
> 
> Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
> ---
>  drivers/input/mouse/focaltech.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
> index fca38ba..5d8cf98 100644
> --- a/drivers/input/mouse/focaltech.c
> +++ b/drivers/input/mouse/focaltech.c
> @@ -67,9 +67,6 @@ static void focaltech_reset(struct psmouse *psmouse)
>  
>  #define FOC_MAX_FINGERS 5
>  
> -#define FOC_MAX_X 2431
> -#define FOC_MAX_Y 1663
> -
>  /*
>   * Current state of a single finger on the touchpad.
>   */
> @@ -131,7 +128,7 @@ static void focaltech_report_state(struct psmouse *psmouse)
>  		if (active) {
>  			input_report_abs(dev, ABS_MT_POSITION_X, finger->x);
>  			input_report_abs(dev, ABS_MT_POSITION_Y,
> -					 FOC_MAX_Y - finger->y);
> +					 priv->y_max - finger->y);

I wonder if we also want to camp teh vaue to 0, y_max... I know userspace is OK
with kernel reporting values greater than max value for the axis, but I worry
about negative vaues.

Thanks.
diff mbox

Patch

diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
index fca38ba..5d8cf98 100644
--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
@@ -67,9 +67,6 @@  static void focaltech_reset(struct psmouse *psmouse)
 
 #define FOC_MAX_FINGERS 5
 
-#define FOC_MAX_X 2431
-#define FOC_MAX_Y 1663
-
 /*
  * Current state of a single finger on the touchpad.
  */
@@ -131,7 +128,7 @@  static void focaltech_report_state(struct psmouse *psmouse)
 		if (active) {
 			input_report_abs(dev, ABS_MT_POSITION_X, finger->x);
 			input_report_abs(dev, ABS_MT_POSITION_Y,
-					 FOC_MAX_Y - finger->y);
+					 priv->y_max - finger->y);
 		}
 	}
 	input_mt_report_pointer_emulation(dev, true);