lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 05/90] Input: synaptics - add a matches_pnp_id helper function
    Date
    3.13.11-ckt20 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hans de Goede <hdegoede@redhat.com>

    commit e2f611029b370bb7a04236215ad4b36aa8cb98cd upstream.

    This is a preparation patch for simplifying the min/max quirk table.

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Cc: Timo Aaltonen <timo.aaltonen@canonical.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/input/mouse/synaptics.c | 25 ++++++++++++++-----------
    1 file changed, 14 insertions(+), 11 deletions(-)

    diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
    index b9b12f74..2f0723d 100644
    --- a/drivers/input/mouse/synaptics.c
    +++ b/drivers/input/mouse/synaptics.c
    @@ -156,6 +156,18 @@ 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
    ****************************************************************************/
    @@ -1428,17 +1440,8 @@ static void set_input_params(struct psmouse *psmouse,

    if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
    __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
    - /* See if this buttonpad has a top button area */
    - if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4)) {
    - for (i = 0; topbuttonpad_pnp_ids[i]; i++) {
    - if (strstr(psmouse->ps2dev.serio->firmware_id,
    - topbuttonpad_pnp_ids[i])) {
    - __set_bit(INPUT_PROP_TOPBUTTONPAD,
    - dev->propbit);
    - break;
    - }
    - }
    - }
    + if (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);
    __clear_bit(BTN_MIDDLE, dev->keybit);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-05-06 00:01    [W:4.050 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site