From patchwork Mon Mar 8 21:13:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mickib1@gmail.com X-Patchwork-Id: 84155 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o28LFKXK031566 for ; Mon, 8 Mar 2010 21:15:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755820Ab0CHVO1 (ORCPT ); Mon, 8 Mar 2010 16:14:27 -0500 Received: from fg-out-1718.google.com ([72.14.220.156]:34719 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755941Ab0CHVOM (ORCPT ); Mon, 8 Mar 2010 16:14:12 -0500 Received: by fg-out-1718.google.com with SMTP id l26so1363765fgb.1 for ; Mon, 08 Mar 2010 13:14:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=580NZtygOGJ9WBfwKMguVXSippbZ9lwiduBSiTFsijs=; b=n1QSO4YqLDqwDZpPmy929FyceRiRokVORR3WTvq0Y3u54Jn6pc66y1QD+cHbMVCQQB rBRNRHIRwk3kOo6ivYG0xWXT/AcqY1dTo4dgE792pyBQuz87N3iavZk5GYXsYawhoo/x Zted5oPMeqWSM+CjaHinpEF95NUXrz7gTFbEw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=inLb0DS/HDjRf6/Cz3aQbWMXASwxamzN5Ktu+qdB347k9Sk2kWAT1GMqLqnTx2wVBL z3+c5HuSZnSip8UbEFcCWxdOfuZTn46o/A1+Gs5xSt53+k7E9TvaLncwHBmxXnVd5+1M mg4PJDa8k6bELbsFYLSMPb3kDOBgc0KjGzYj8= Received: by 10.102.188.6 with SMTP id l6mr294268muf.9.1268082850392; Mon, 08 Mar 2010 13:14:10 -0800 (PST) Received: from localhost.localdomain (bzq-84-108-117-55.cablep.bezeqint.net [84.108.117.55]) by mx.google.com with ESMTPS id y37sm9818207mug.52.2010.03.08.13.14.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 13:14:09 -0800 (PST) From: mickib1@gmail.com To: jkosina@suse.cz, rafi@seas.upenn.edu, chatty@enac.fr, peterhuewe@gmx.de, micki@n-trig.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] HID: N-trig MTM Driver fix And cleanup patch 6 Date: Mon, 8 Mar 2010 23:13:46 +0200 Message-Id: <1268082827-2680-6-git-send-email-micki@n-trig.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268082827-2680-5-git-send-email-micki@n-trig.com> References: <1268082827-2680-1-git-send-email-micki@n-trig.com> <1268082827-2680-2-git-send-email-micki@n-trig.com> <1268082827-2680-3-git-send-email-micki@n-trig.com> <1268082827-2680-4-git-send-email-micki@n-trig.com> <1268082827-2680-5-git-send-email-micki@n-trig.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 08 Mar 2010 21:15:20 +0000 (UTC) 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); }