Attachment 936450 Details for Bug 1110011 – [PATCH 2/3] psmouse: Add psmouse_matches_pnp_id helper function

[patch] [PATCH 2/3] psmouse: Add psmouse_matches_pnp_id helper function

0002-psmouse-Add-psmouse_matches_pnp_id-helper-function.patch (text/plain), 3.47 KB, created by Hans de Goede on 2014-09-11 08:55:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2014-09-11 08:55:12 UTC

Size: 3.47 KB

patch

obsolete

>From 2dd4895f1a476802b1902a8b8075135e59b31edd Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Fri, 27 Jun 2014 18:46:42 +0200
>Subject: [PATCH 2/3] psmouse: Add psmouse_matches_pnp_id helper function
>
>The matches_pnp_id function from the synaptics driver is useful for other
>drivers too. Make it a generic psmouse helper function.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>---
> drivers/input/mouse/psmouse-base.c | 14 ++++++++++++++
> drivers/input/mouse/psmouse.h      |  1 +
> drivers/input/mouse/synaptics.c    | 17 +++--------------
> 3 files changed, 18 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
>index b4e1f01..02e68c3 100644
>--- a/drivers/input/mouse/psmouse-base.c
>+++ b/drivers/input/mouse/psmouse-base.c
>@@ -462,6 +462,20 @@ static int psmouse_poll(struct psmouse *psmouse)
> 			   PSMOUSE_CMD_POLL | (psmouse->pktsize << 8));
> }
> 
>+/*
>+ * psmouse_matches_pnp_id - check if psmouse matches one of the passed in ids.
>+ */
>+bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
>+{
>+	int i;
>+
>+	if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
>+		for (i = 0; ids[i]; i++)
>+			if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
>+				return true;
>+
>+	return false;
>+}
> 
> /*
>  * Genius NetMouse magic init.
>diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
>index 2f0b39d..f4cf664 100644
>--- a/drivers/input/mouse/psmouse.h
>+++ b/drivers/input/mouse/psmouse.h
>@@ -108,6 +108,7 @@ void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
> psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);
> int psmouse_activate(struct psmouse *psmouse);
> int psmouse_deactivate(struct psmouse *psmouse);
>+bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[]);
> 
> struct psmouse_attribute {
> 	struct device_attribute dattr;
>diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
>index e8573c6..854caca 100644
>--- a/drivers/input/mouse/synaptics.c
>+++ b/drivers/input/mouse/synaptics.c
>@@ -185,18 +185,6 @@ static const char * const topbuttonpad_pnp_ids[] = {
> 	NULL
> };
> 
>-static bool matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
>-{
>-	int i;
>-
>-	if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
>-		for (i = 0; ids[i]; i++)
>-			if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
>-				return true;
>-
>-	return false;
>-}
>-
> /*****************************************************************************
>  *	Synaptics communications functions
>  ****************************************************************************/
>@@ -362,7 +350,8 @@ static int synaptics_resolution(struct psmouse *psmouse)
> 	}
> 
> 	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
>-		if (matches_pnp_id(psmouse, min_max_pnpid_table[i].pnp_ids)) {
>+		if (psmouse_matches_pnp_id(psmouse,
>+					   min_max_pnpid_table[i].pnp_ids)) {
> 			priv->x_min = min_max_pnpid_table[i].x_min;
> 			priv->x_max = min_max_pnpid_table[i].x_max;
> 			priv->y_min = min_max_pnpid_table[i].y_min;
>@@ -1456,7 +1445,7 @@ static void set_input_params(struct psmouse *psmouse,
> 
> 	if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
> 		__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
>-		if (matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
>+		if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
> 			__set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
> 		/* Clickpads report only left button */
> 		__clear_bit(BTN_RIGHT, dev->keybit);
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1110011: 909256 | 910487 | 911004 | 911302 | 912515 | 912895 | 913906 | 914298 | 918211 | 918212 | 935276 | 936265 | 936449 | 936450 | 936452 | 936719 | 936721 | 940521 | 940523 | 940594 | 940595 | 940596 | 940606 | 940607 | 940727 | 940751 | 944389 | 953046 | 956262 | 995746 | 995763 | 1007865 | 1007880 | 1007881 | 1008039