public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: "Pali Rohár" <pali.rohar@gmail.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] input: psmouse: Use same format for secondary devices as for primary
Date: Sat, 18 Jun 2016 10:10:02 -0700	[thread overview]
Message-ID: <20160618171002.GA15429@dtor-ws> (raw)
In-Reply-To: <1466268164-19264-1-git-send-email-pali.rohar@gmail.com>

On Sat, Jun 18, 2016 at 06:42:44PM +0200, Pali Rohár wrote:
> This patch changes name of secondary psmouse devices to mach format of
> primary device. Format of primary device is "protocol vendor name" and is
> set by function psmouse_switch_protocol() in file psmouse-base.c.
> 
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>

Applied, thank you.

> ---
>  drivers/input/mouse/elantech.c |    2 +-
>  drivers/input/mouse/lifebook.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index 78f93cf..e0fbd42 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1714,7 +1714,7 @@ int elantech_init(struct psmouse *psmouse)
>  		snprintf(etd->tp_phys, sizeof(etd->tp_phys), "%s/input1",
>  			psmouse->ps2dev.serio->phys);
>  		tp_dev->phys = etd->tp_phys;
> -		tp_dev->name = "Elantech PS/2 TrackPoint";
> +		tp_dev->name = "ETPS/2 Elantech TrackPoint";
>  		tp_dev->id.bustype = BUS_I8042;
>  		tp_dev->id.vendor  = 0x0002;
>  		tp_dev->id.product = PSMOUSE_ELANTECH;
> diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
> index e5ed216..13d324c 100644
> --- a/drivers/input/mouse/lifebook.c
> +++ b/drivers/input/mouse/lifebook.c
> @@ -287,7 +287,7 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
>  		 "%s/input1", psmouse->ps2dev.serio->phys);
>  
>  	dev2->phys = priv->phys;
> -	dev2->name = "PS/2 Touchpad";
> +	dev2->name = "LBPS/2 Fujitsu Lifebook Touchpad";
>  	dev2->id.bustype = BUS_I8042;
>  	dev2->id.vendor  = 0x0002;
>  	dev2->id.product = PSMOUSE_LIFEBOOK;
> -- 
> 1.7.9.5
> 

-- 
Dmitry

      reply	other threads:[~2016-06-18 17:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-18 16:42 [PATCH] input: psmouse: Use same format for secondary devices as for primary Pali Rohár
2016-06-18 17:10 ` Dmitry Torokhov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160618171002.GA15429@dtor-ws \
    --to=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pali.rohar@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox