From patchwork Mon Mar 22 14:48:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Achatz X-Patchwork-Id: 87438 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 o2MEmWAv020832 for ; Mon, 22 Mar 2010 14:48:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753105Ab0CVOsc (ORCPT ); Mon, 22 Mar 2010 10:48:32 -0400 Received: from mail-in-09.arcor-online.net ([151.189.21.49]:35446 "EHLO mail-in-09.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751916Ab0CVOsb (ORCPT ); Mon, 22 Mar 2010 10:48:31 -0400 Received: from mail-in-11-z2.arcor-online.net (mail-in-11-z2.arcor-online.net [151.189.8.28]) by mx.arcor.de (Postfix) with ESMTP id EB3F01AF685; Mon, 22 Mar 2010 15:48:29 +0100 (CET) Received: from mail-in-05.arcor-online.net (mail-in-05.arcor-online.net [151.189.21.45]) by mail-in-11-z2.arcor-online.net (Postfix) with ESMTP id C83B4D4703; Mon, 22 Mar 2010 15:48:29 +0100 (CET) Received: from [192.168.0.1] (dslb-088-075-229-157.pools.arcor-ip.net [88.75.229.157]) by mail-in-05.arcor-online.net (Postfix) with ESMTPS id D396D332B63; Mon, 22 Mar 2010 15:48:25 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-05.arcor-online.net D396D332B63 Subject: [PATCH 2/2] Updated hid_blacklist, reformatted code and removed unused variable From: Stefan Achatz To: Jiri Kosina Cc: Randy Dunlap , Stephane Chatty , Jussi Kivilinna , wylda@volny.cz, Michael Poole , simon.windows@gmail.com, Sean Hildebrand , Sid Boyce , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-input@vger.kernel.org In-Reply-To: References: <1268926981.11269.3.camel@localhost> Date: Mon, 22 Mar 2010 15:48:24 +0100 Message-ID: <1269269304.2236.1.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-1.fc12) 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, 22 Mar 2010 14:48:34 +0000 (UTC) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 368fbb0..dbd6fb8 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1346,6 +1346,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index 1a5e993..2b1412e 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c @@ -509,7 +509,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev, { struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev)); struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev)); - int retval, checksum; + int retval; unsigned long state; retval = strict_strtoul(buf, 10, &state); @@ -975,13 +975,18 @@ static int kone_raw_event(struct hid_device *hdev, struct hid_report *report, static const struct hid_device_id kone_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) }, - { } }; + { } +}; MODULE_DEVICE_TABLE(hid, kone_devices); -static struct hid_driver kone_driver = { .name = "kone", - .id_table = kone_devices, .probe = kone_probe, - .remove = kone_remove, .raw_event = kone_raw_event, }; +static struct hid_driver kone_driver = { + .name = "kone", + .id_table = kone_devices, + .probe = kone_probe, + .remove = kone_remove, + .raw_event = kone_raw_event +}; static int kone_init(void) {