Input: psmouse - use same format for secondary devices as for primary

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>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 78f93cf68840d24328ebd0630f86c4e372d051bf..e0fbd423d67593ae7bc07ea9600df98fc9fcec9a 100644 (file)
--- 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 e5ed216824e917ed2db576e125d1287a680fc9bf..13d324cef7df5c3af35e4b3aa735e31bf2c4655a 100644 (file)
--- 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;