From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/11] Twidjoy build fix
Date: Wed, 24 Nov 2004 02:08:12 -0500 [thread overview]
Message-ID: <200411240208.14115.dtor_core@ameritech.net> (raw)
In-Reply-To: <200411240207.33932.dtor_core@ameritech.net>
===================================================================
ChangeSet@1.1939.3.37, 2004-11-15 23:25:52-05:00, dtor_core@ameritech.net
Input: twidjoy - apparently Kconfig and Makefile disagreed on the
name for config option so the module was never built.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Makefile | 2 +-
twidjoy.c | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
===================================================================
diff -Nru a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
--- a/drivers/input/joystick/Makefile 2004-11-24 01:47:17 -05:00
+++ b/drivers/input/joystick/Makefile 2004-11-24 01:47:17 -05:00
@@ -24,7 +24,7 @@
obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o
obj-$(CONFIG_JOYSTICK_TMDC) += tmdc.o
obj-$(CONFIG_JOYSTICK_TURBOGRAFX) += turbografx.o
-obj-$(CONFIG_JOYSTICK_TWIDJOY) += twidjoy.o
+obj-$(CONFIG_JOYSTICK_TWIDDLER) += twidjoy.o
obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o
obj-$(CONFIG_JOYSTICK_IFORCE) += iforce/
diff -Nru a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
--- a/drivers/input/joystick/twidjoy.c 2004-11-24 01:47:17 -05:00
+++ b/drivers/input/joystick/twidjoy.c 2004-11-24 01:47:17 -05:00
@@ -58,7 +58,9 @@
#include <linux/serio.h>
#include <linux/init.h>
-MODULE_DESCRIPTION("Handykey Twiddler keyboard as a joystick driver");
+#define DRIVER_DESC "Handykey Twiddler keyboard as a joystick driver"
+
+MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
/*
@@ -147,7 +149,7 @@
static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs)
{
- struct twidjoy *twidjoy = serio->private;
+ struct twidjoy *twidjoy = serio_get_drvdata(serio);
/* All Twiddler packets are 5 bytes. The fact that the first byte
* has a MSB of 0 and all other bytes have a MSB of 1 can be used
@@ -175,9 +177,11 @@
static void twidjoy_disconnect(struct serio *serio)
{
- struct twidjoy *twidjoy = serio->private;
+ struct twidjoy *twidjoy = serio_get_drvdata(serio);
+
input_unregister_device(&twidjoy->dev);
serio_close(serio);
+ serio_set_drvdata(serio, NULL);
kfree(twidjoy);
}
@@ -231,9 +235,11 @@
}
twidjoy->dev.private = twidjoy;
- serio->private = twidjoy;
+
+ serio_set_drvdata(serio, twidjoy);
if (serio_open(serio, drv)) {
+ serio_set_drvdata(serio, NULL);
kfree(twidjoy);
return;
}
next prev parent reply other threads:[~2004-11-24 7:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-24 7:05 [PATCH 0/11] New input patches Dmitry Torokhov
2004-11-24 7:06 ` [PATCH 1/11] Atkbd keycodesize fix Dmitry Torokhov
2004-11-24 7:06 ` [PATCH 2/11] Psmouse polling for KVMs Dmitry Torokhov
2004-11-24 7:07 ` [PATCH 3/11] Addd serio_get/put_drvdata functions Dmitry Torokhov
2004-11-24 7:08 ` Dmitry Torokhov [this message]
2004-11-24 7:09 ` [PATCH 5/11] serio - use id matching Dmitry Torokhov
2004-11-24 7:09 ` [PATCH 6/11] serio bus code cleanup Dmitry Torokhov
2004-11-24 7:10 ` [PATCH 7/11] input: use msecs_to_jiffies Dmitry Torokhov
2004-11-24 7:10 ` [PATCH 8/11] atkbd: " Dmitry Torokhov
2004-11-24 7:11 ` [PATCH 9/11] gameport renames part 1 Dmitry Torokhov
2004-11-24 7:11 ` [PATCH 10/11] gameport renames part 2 Dmitry Torokhov
2004-11-24 7:13 ` [PATCH 11/11] gameport: connect/disconnect mandatory Dmitry Torokhov
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=200411240208.14115.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox