linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Herrmann <dh.herrmann@googlemail.com>
To: linux-input@vger.kernel.org
Cc: padovan@profusion.mobi, jkosina@suse.cz, oliver@neukum.org,
	David Herrmann <dh.herrmann@googlemail.com>
Subject: [PATCH 03/12] HID: wiimote: Add wiimote device structure
Date: Mon, 27 Jun 2011 16:30:04 +0200	[thread overview]
Message-ID: <1309185013-484-3-git-send-email-dh.herrmann@googlemail.com> (raw)
In-Reply-To: <1309185013-484-1-git-send-email-dh.herrmann@googlemail.com>

Allocate wiimote device structure with all wiimote related data
when registering new wiimote devices.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
---
 drivers/hid/hid-wiimote.c |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-wiimote.c b/drivers/hid/hid-wiimote.c
index ed4fe18..ff7cf12 100644
--- a/drivers/hid/hid-wiimote.c
+++ b/drivers/hid/hid-wiimote.c
@@ -17,6 +17,10 @@
 #define WIIMOTE_VERSION "0.1"
 #define WIIMOTE_NAME "Nintendo Wii Remote"
 
+struct wiimote_data {
+	struct hid_device *hdev;
+};
+
 static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report,
 							u8 *raw_data, int size)
 {
@@ -26,31 +30,64 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report,
 	return 0;
 }
 
+static struct wiimote_data *wiimote_create(struct hid_device *hdev)
+{
+	struct wiimote_data *wdata;
+
+	wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);
+	if (!wdata)
+		return NULL;
+
+	wdata->hdev = hdev;
+	hid_set_drvdata(hdev, wdata);
+
+	return wdata;
+}
+
+static void wiimote_destroy(struct wiimote_data *wdata)
+{
+	kfree(wdata);
+}
+
 static int wiimote_hid_probe(struct hid_device *hdev,
 				const struct hid_device_id *id)
 {
+	struct wiimote_data *wdata;
 	int ret;
 
+	wdata = wiimote_create(hdev);
+	if (!wdata) {
+		hid_err(hdev, "Can't alloc device\n");
+		return -ENOMEM;
+	}
+
 	ret = hid_parse(hdev);
 	if (ret) {
 		hid_err(hdev, "HID parse failed\n");
-		return ret;
+		goto err;
 	}
 
 	ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
 	if (ret) {
 		hid_err(hdev, "HW start failed\n");
-		return ret;
+		goto err;
 	}
 
 	hid_info(hdev, "New device registered\n");
 	return 0;
+
+err:
+	wiimote_destroy(wdata);
+	return ret;
 }
 
 static void wiimote_hid_remove(struct hid_device *hdev)
 {
+	struct wiimote_data *wdata = hid_get_drvdata(hdev);
+
 	hid_info(hdev, "Device removed\n");
 	hid_hw_stop(hdev);
+	wiimote_destroy(wdata);
 }
 
 static const struct hid_device_id wiimote_hid_devices[] = {
-- 
1.7.5.2


  parent reply	other threads:[~2011-06-27 14:30 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-27 14:30 [PATCH 01/12] HID: wiimote: Add Nintendo Wii Remote driver stub David Herrmann
2011-06-27 14:30 ` [PATCH 02/12] HID: wiimote: Register wiimote hid " David Herrmann
2011-06-27 14:30 ` David Herrmann [this message]
2011-06-27 14:30 ` [PATCH 04/12] HID: wiimote: Register input device in wiimote hid driver David Herrmann
2011-06-27 14:30 ` [PATCH 05/12] HID: wiimote: Synchronize wiimote input and hid event handling David Herrmann
2011-06-28  5:49   ` Dmitry Torokhov
2011-06-29 12:39     ` David Herrmann
2011-07-11 12:29       ` Jiri Kosina
2011-06-27 14:30 ` [PATCH 06/12] HID: wiimote: Add wiimote send function David Herrmann
2011-06-27 14:30 ` [PATCH 07/12] HID: wiimote: Add output queue for wiimote driver David Herrmann
2011-06-28  4:51   ` Dmitry Torokhov
2011-06-29 12:53     ` David Herrmann
2011-06-27 14:30 ` [PATCH 08/12] HID: wiimote: Add wiimote event handler David Herrmann
2011-06-27 14:30 ` [PATCH 09/12] HID: wiimote: Add wiimote input button parser David Herrmann
2011-06-28  5:52   ` Dmitry Torokhov
2011-06-29 12:43     ` David Herrmann
2011-06-27 14:30 ` [PATCH 10/12] HID: wiimote: Add wiimote led request David Herrmann
2011-06-27 14:30 ` [PATCH 11/12] HID: wiimote: Cache wiimote led state David Herrmann
2011-06-27 14:30 ` [PATCH 12/12] HID: wiimote: Add sysfs support to wiimote driver David Herrmann
  -- strict thread matches above, loose matches on Subject: below --
2011-07-05 11:45 [PATCH 01/12] HID: wiimote: Add Nintendo Wii Remote driver stub David Herrmann
2011-07-05 11:45 ` [PATCH 03/12] HID: wiimote: Add wiimote device structure David Herrmann

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=1309185013-484-3-git-send-email-dh.herrmann@googlemail.com \
    --to=dh.herrmann@googlemail.com \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=oliver@neukum.org \
    --cc=padovan@profusion.mobi \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).