From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@euromail.se>,
Benjamin Tissoires <benjamin.tissoires@enac.fr>,
Jiri Kosina <jkosina@suse.cz>,
Stephane Chatty <chatty@lii-enac.fr>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
Date: Thu, 19 May 2011 14:18:18 +0200 [thread overview]
Message-ID: <1305807498-8785-7-git-send-email-benjamin.tissoires@enac.fr> (raw)
In-Reply-To: <1305807498-8785-1-git-send-email-benjamin.tissoires@enac.fr>
Stantum devices used to work with MT_CLS_STANTUM but MT_CLS_CONFIDENCE
is exactly the same. This patch switches them to this generic class,
and remove the unused MT_CLS_STANTUM.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
---
drivers/hid/hid-multitouch.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index feeb0b7..65b92d2 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -88,7 +88,6 @@ struct mt_class {
#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3
#define MT_CLS_CYPRESS 4
#define MT_CLS_EGALAX 5
-#define MT_CLS_STANTUM 6
#define MT_CLS_3M 7
#define MT_CLS_CONFIDENCE 8
#define MT_CLS_CONFIDENCE_MINUS_ONE 9
@@ -154,8 +153,6 @@ struct mt_class mt_classes[] = {
.sn_move = 4096,
.sn_pressure = 32,
},
- { .name = MT_CLS_STANTUM,
- .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
{ .name = MT_CLS_3M,
.quirks = MT_QUIRK_VALID_IS_CONFIDENCE |
MT_QUIRK_SLOT_IS_CONTACTID,
@@ -673,13 +670,13 @@ static const struct hid_device_id mt_devices[] = {
USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
/* Stantum panels */
- { .driver_data = MT_CLS_STANTUM,
+ { .driver_data = MT_CLS_CONFIDENCE,
HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
USB_DEVICE_ID_MTP)},
- { .driver_data = MT_CLS_STANTUM,
+ { .driver_data = MT_CLS_CONFIDENCE,
HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
USB_DEVICE_ID_MTP_STM)},
- { .driver_data = MT_CLS_STANTUM,
+ { .driver_data = MT_CLS_CONFIDENCE,
HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
USB_DEVICE_ID_MTP_SITRONIX)},
--
1.7.4.4
next prev parent reply other threads:[~2011-05-19 12:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 12:18 [PATCH 0/6] Support for multiple devices Benjamin Tissoires
2011-05-19 12:18 ` [PATCH 1/6] hid-multitouch: add support for ActionStar panels Benjamin Tissoires
2011-05-19 12:18 ` [PATCH 2/6] hid-multitouch: add support for CVTouch panels Benjamin Tissoires
2011-05-19 12:18 ` [PATCH 3/6] hid-multitouch: add support for GoodTouch panels Benjamin Tissoires
2011-05-19 12:18 ` [PATCH 4/6] hid-multitouch: add support for Touch International panels Benjamin Tissoires
2011-05-19 12:18 ` [PATCH 5/6] hid-multitouch: add support for Unitec panels Benjamin Tissoires
2011-05-19 12:18 ` Benjamin Tissoires [this message]
2011-05-20 8:35 ` [PATCH 6/6] hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE Jiri Kosina
2011-05-20 10:32 ` Benjamin Tissoires
2011-05-20 11:37 ` Jiri Kosina
2011-05-20 13:10 ` Benjamin Tissoires
2011-05-23 9:22 ` [PATCH 0/6] Support for multiple devices Henrik Rydberg
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=1305807498-8785-7-git-send-email-benjamin.tissoires@enac.fr \
--to=benjamin.tissoires@enac.fr \
--cc=chatty@lii-enac.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/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
all inboxes | Powered by JetHome®