From patchwork Sat Jun 18 16:42:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 9185749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46D17601C0 for ; Sat, 18 Jun 2016 16:44:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CA4F27D45 for ; Sat, 18 Jun 2016 16:44:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2110728365; Sat, 18 Jun 2016 16:44:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B408427D45 for ; Sat, 18 Jun 2016 16:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751374AbcFRQoI (ORCPT ); Sat, 18 Jun 2016 12:44:08 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32863 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751316AbcFRQoH (ORCPT ); Sat, 18 Jun 2016 12:44:07 -0400 Received: by mail-wm0-f67.google.com with SMTP id r201so4565357wme.0; Sat, 18 Jun 2016 09:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TfnO7oH1zfCX6QIzhcBiLM10jMGFav9EmVDWGXuFIqQ=; b=gCYIyYM9X7VHCzxv2VFYxuz/5eVlnaNmc2vsv/P6pfewIs0TWKhtuLEB7MITIcipaD lYXa0HaJx2PMbr8p8C/XhWVEqRZry3AhmXS9UkK7GKAJoYzR8/24+Y0tu8vwyUwFGg3p 39cued83LB6Wq0ewTz7W93bVuQiV8X89WnDs1JWy5MWmqbo8ADM+AQWeYCbtsYppTgNS mKM/ZmZZE3n7si7iYK7PKRGrAe2o+HGDIqqWUpx0jaLEVb+M4V6/5Xfxv9/AVGDVIxbR X+f+Yk0PVyBqNmH0HpdIwWpM1vNMW+xbZDZl/XkpqJAf9ejN4qS7j9UUFw/wyXWE9H09 bcXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TfnO7oH1zfCX6QIzhcBiLM10jMGFav9EmVDWGXuFIqQ=; b=HTGzZCtpT7n9qdCWcLw9Hq49dv1ElTiQ5I5OZZ1ZQPCyBPpePBtyYV47XoXdBS335N TgckrjL0ojSvG3hUN0aj4fXMjDsiKhOJJaW67uw03f64n6QUd16ZXZmFF1b+qJ/BMuNl spjgwsMg0qE249wR9GotFHOWhWGnqnmCtb7Xq+dRzUgVd7tK3xb2iNrvlxcYy4G/98gr ckMD2vhN4pQtxnNCEpE5l3/UJ+tfgljFqkyuUBjA0aWVVSDzX6vuLlfIGDtyRYvAAp3E 1PUwHoGlpt8Fgi7oIBwLo72RLmZC01wWdkFsidPEYwgNNjMT0C1FEtj/TC08mkDeudeB 7S+A== X-Gm-Message-State: ALyK8tIujqIcGQ5PLDz8FCtYuba+G2ii0vr+AXbC0s4sg8L2crP6Ewb+gGGv4zyQDDm8iA== X-Received: by 10.194.133.9 with SMTP id oy9mr8070324wjb.41.1466268245479; Sat, 18 Jun 2016 09:44:05 -0700 (PDT) Received: from Pali-Latitude.lan (pali.kolej.mff.cuni.cz. [78.128.193.202]) by smtp.gmail.com with ESMTPSA id zg10sm30103545wjb.1.2016.06.18.09.44.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jun 2016 09:44:04 -0700 (PDT) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH] input: psmouse: Use same format for secondary devices as for primary Date: Sat, 18 Jun 2016 18:42:44 +0200 Message-Id: <1466268164-19264-1-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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;