From c4e4e2d0adc2b07aa597fb4b79b122218583b764 Mon Sep 17 00:00:00 2001
From: Rafi Rubin <rafi@seas.upenn.edu>
Date: Mon, 3 May 2010 05:08:30 -0400
Subject: [PATCH] --- yaml --- r: 190750 b: refs/heads/master c:
 ed7e2ca24bfff5c7a09de8a05c536f68560b34fb h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/hid/hid-ntrig.c | 32 ++------------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 2864c84a8b3b..d9aa5a227a8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 250d377522fd81459a4ea2350a794b453f37ce7d
+refs/heads/master: ed7e2ca24bfff5c7a09de8a05c536f68560b34fb
diff --git a/trunk/drivers/hid/hid-ntrig.c b/trunk/drivers/hid/hid-ntrig.c
index 10b08d6ab37c..4777bbfa1cc2 100644
--- a/trunk/drivers/hid/hid-ntrig.c
+++ b/trunk/drivers/hid/hid-ntrig.c
@@ -24,9 +24,6 @@
 
 #define NTRIG_DUPLICATE_USAGES	0x001
 
-#define nt_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \
-					EV_KEY, (c))
-
 struct ntrig_data {
 	/* Incoming raw values for a single contact */
 	__u16 x, y, w, h;
@@ -257,29 +254,10 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
 			nd->reading_mt = 0;
 
 			if (nd->first_contact_touch) {
-				switch (value) {
-				case 0:	/* for single touch devices */
-				case 1:
-					input_report_key(input,
-							BTN_TOOL_DOUBLETAP, 1);
-					break;
-				case 2:
-					input_report_key(input,
-							BTN_TOOL_TRIPLETAP, 1);
-					break;
-				case 3:
-				default:
-					input_report_key(input,
-							BTN_TOOL_QUADTAP, 1);
-				}
+				input_report_key(input, BTN_TOOL_DOUBLETAP, 1);
 				input_report_key(input, BTN_TOUCH, 1);
 			} else {
-				input_report_key(input,
-						BTN_TOOL_DOUBLETAP, 0);
-				input_report_key(input,
-						BTN_TOOL_TRIPLETAP, 0);
-				input_report_key(input,
-						BTN_TOOL_QUADTAP, 0);
+				input_report_key(input, BTN_TOOL_DOUBLETAP, 0);
 				input_report_key(input, BTN_TOUCH, 0);
 			}
 			break;
@@ -345,13 +323,7 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
 			__clear_bit(BTN_TOOL_PEN, input->keybit);
 			__clear_bit(BTN_TOOL_FINGER, input->keybit);
 			__clear_bit(BTN_0, input->keybit);
-			/*
-			 * A little something special to enable
-			 * two and three finger taps.
-			 */
 			__set_bit(BTN_TOOL_DOUBLETAP, input->keybit);
-			__set_bit(BTN_TOOL_TRIPLETAP, input->keybit);
-			__set_bit(BTN_TOOL_QUADTAP, input->keybit);
 			/*
 			 * The physical touchscreen (single touch)
 			 * input has a value for physical, whereas