Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c11eaa authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov
Browse files

Input: alps - change decode function prototype to return an int 



So that decode functions can return a failure when appropriate.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 99d9996c

drivers/input/mouse/alps.c

+9 −3
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static void alps_decode_buttons_v3(struct alps_fields *f, unsigned char *p) 
	f->ts_middle = !!(p[3] & 0x40);

}



static void alps_decode_pinnacle(struct alps_fields *f, unsigned char *p,

static int alps_decode_pinnacle(struct alps_fields *f, unsigned char *p,

				 struct psmouse *psmouse)

{

	f->first_mp = !!(p[4] & 0x40);
@@ -558,9 +558,11 @@ static void alps_decode_pinnacle(struct alps_fields *f, unsigned char *p, 
	f->pressure = p[5] & 0x7f;



	alps_decode_buttons_v3(f, p);



	return 0;

}



static void alps_decode_rushmore(struct alps_fields *f, unsigned char *p,

static int alps_decode_rushmore(struct alps_fields *f, unsigned char *p,

				 struct psmouse *psmouse)

{

	alps_decode_pinnacle(f, p, psmouse);
@@ -570,9 +572,11 @@ static void alps_decode_rushmore(struct alps_fields *f, unsigned char *p, 
	f->fingers = max((p[5] & 0x3), ((p[5] >> 2) & 0x3)) + 1;

	f->x_map |= (p[5] & 0x10) << 11;

	f->y_map |= (p[5] & 0x20) << 6;



	return 0;

}



static void alps_decode_dolphin(struct alps_fields *f, unsigned char *p,

static int alps_decode_dolphin(struct alps_fields *f, unsigned char *p,

				struct psmouse *psmouse)

{

	u64 palm_data = 0;
@@ -605,6 +609,8 @@ static void alps_decode_dolphin(struct alps_fields *f, unsigned char *p, 
		f->x_map = (palm_data >> priv->y_bits) &

			   (BIT(priv->x_bits) - 1);

	}



	return 0;

}



static void alps_process_touchpad_packet_v3_v5(struct psmouse *psmouse)

drivers/input/mouse/alps.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ struct alps_data { 


	int (*hw_init)(struct psmouse *psmouse);

	void (*process_packet)(struct psmouse *psmouse);

	void (*decode_fields)(struct alps_fields *f, unsigned char *p,

	int (*decode_fields)(struct alps_fields *f, unsigned char *p,

			      struct psmouse *psmouse);

	void (*set_abs_params)(struct alps_data *priv, struct input_dev *dev1);