summaryrefslogtreecommitdiffstats
path: root/include/linux/uinput.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-06-30 00:48:14 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-06-30 00:48:14 -0500
commit0048e6030d41453c2f5ce0e9aead910d46cfd448 (patch)
treef7d6ed2acdc2ee4db3ffba332ba629efc014c1ee /include/linux/uinput.h
parent152c12f568d4fc6e9a7dfd42f2d51347fb41d9b7 (diff)
downloadlinux-stable-0048e6030d41453c2f5ce0e9aead910d46cfd448.tar.gz
linux-stable-0048e6030d41453c2f5ce0e9aead910d46cfd448.tar.bz2
linux-stable-0048e6030d41453c2f5ce0e9aead910d46cfd448.zip
Input: uinput - use completions instead of events and manual
wakeups in force feedback code. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux/uinput.h')
-rw-r--r--include/linux/uinput.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index 4c2c82336d10..84876077027f 100644
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -42,8 +42,7 @@ struct uinput_request {
int code; /* UI_FF_UPLOAD, UI_FF_ERASE */
int retval;
- wait_queue_head_t waitq;
- int completed;
+ struct completion done;
union {
int effect_id;
@@ -62,7 +61,7 @@ struct uinput_device {
struct uinput_request *requests[UINPUT_NUM_REQUESTS];
wait_queue_head_t requests_waitq;
- struct semaphore requests_sem;
+ spinlock_t requests_lock;
};
#endif /* __KERNEL__ */