diff mbox

[6/7] HID: N-trig MTM Driver fix And cleanup patch 6

Message ID 1268082827-2680-6-git-send-email-micki@n-trig.com
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

mickib1@gmail.com March 8, 2010, 9:13 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index 8bf796c..f88533e 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -21,6 +21,9 @@ 
  *		send set feature command to firmware
  *	1.5 - N-trig udpate ntrig_probe
  *		add call to ntrig_send_report function
+ *	1.6 - N-trig Update ntrig_init print version number
+ *		update struct hid_driver
+ *		update struct hid_device_id
  */
 
 /*
@@ -458,15 +461,11 @@  static void ntrig_remove(struct hid_device *hdev)
 
 static const struct hid_device_id ntrig_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN),
-		.driver_data = NTRIG_DUPLICATE_USAGES },
+		.driver_data = NTRIG_USB_DEVICE_ID },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, ntrig_devices);
 
-static const struct hid_usage_id ntrig_grabbed_usages[] = {
-	{ HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
-	{ HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1 }
-};
 
 static struct hid_driver ntrig_driver = {
 	.name = MODULE_NAME,
@@ -475,12 +474,12 @@  static struct hid_driver ntrig_driver = {
 	.remove = ntrig_remove,
 	.input_mapping = ntrig_input_mapping,
 	.input_mapped = ntrig_input_mapped,
-	.usage_table = ntrig_grabbed_usages,
 	.event = ntrig_event,
 };
 
 static int __init ntrig_init(void)
 {
+	info("N-trig Driver Version 1.6\n");
 	return hid_register_driver(&ntrig_driver);
 }