All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Achatz <erazor_de@users.sourceforge.net>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Randy Dunlap <rdunlap@xenotime.net>,
	Stephane Chatty <chatty@enac.fr>,
	Jussi Kivilinna <jussi.kivilinna@mbnet.fi>,
	wylda@volny.cz, Michael Poole <mdpoole@troilus.org>,
	simon.windows@gmail.com,
	Sean Hildebrand <silverwraithii@gmail.com>,
	Sid Boyce <sboyce@blueyonder.co.uk>,
	linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
	linux-input@vger.kernel.org
Subject: [PATCH 2/2] Updated hid_blacklist, reformatted code and removed unused variable
Date: Mon, 22 Mar 2010 15:48:24 +0100	[thread overview]
Message-ID: <1269269304.2236.1.camel@localhost> (raw)
In-Reply-To: <alpine.LNX.2.00.1003220936270.18642@pobox.suse.cz>

Updated hid_blacklist[] so that generic driver keeps his hands off.
Reformatted code so that definition of kone_driver and kone_devices[]
have one initialization per line and closing brace is on extra line.
Removed an unused variable declaration.

Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
---
 drivers/hid/hid-core.c        |    1 +
 drivers/hid/hid-roccat-kone.c |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

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)
 {
-- 
1.6.6.1




  reply	other threads:[~2010-03-22 14:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-18 15:43 [PATCH] HID: add driver for Roccat Kone gaming mouse 2nd Attempt Stefan Achatz
2010-03-22  8:41 ` Jiri Kosina
2010-03-22 14:48   ` Stefan Achatz [this message]
2010-03-22 14:53     ` [PATCH 2/2] Updated hid_blacklist, reformatted code and removed unused variable Jiri Kosina
2010-03-22 15:14       ` Stefan Achatz
2010-03-22 15:27         ` Jiri Kosina

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=1269269304.2236.1.camel@localhost \
    --to=erazor_de@users.sourceforge.net \
    --cc=chatty@enac.fr \
    --cc=jkosina@suse.cz \
    --cc=jussi.kivilinna@mbnet.fi \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mdpoole@troilus.org \
    --cc=rdunlap@xenotime.net \
    --cc=sboyce@blueyonder.co.uk \
    --cc=silverwraithii@gmail.com \
    --cc=simon.windows@gmail.com \
    --cc=wylda@volny.cz \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.