summaryrefslogtreecommitdiff
path: root/include/linux/gameport.h
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-02-19 08:22:03 +0300
committerDmitry Torokhov <dtor_core@ameritech.net>2006-02-19 08:22:03 +0300
commit286295eb936e76347173639c218134e6342440f9 (patch)
treea6a746aaa8df21691c71454d1f522a4188a54558 /include/linux/gameport.h
parentc4e32e9faaaa83340dbbc00e07c48d38f032b7dc (diff)
downloadlinux-286295eb936e76347173639c218134e6342440f9.tar.xz
Input: gameport - semaphore to mutex conversion
The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux/gameport.h')
-rw-r--r--include/linux/gameport.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index 2401dea2b867..3e1b9b285258 100644
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -11,6 +11,7 @@
#include <asm/io.h>
#include <linux/list.h>
+#include <linux/mutex.h>
#include <linux/device.h>
#include <linux/timer.h>
@@ -40,7 +41,7 @@ struct gameport {
struct gameport *parent, *child;
struct gameport_driver *drv;
- struct semaphore drv_sem; /* protects serio->drv so attributes can pin driver */
+ struct mutex drv_mutex; /* protects serio->drv so attributes can pin driver */
struct device dev;
unsigned int registered; /* port has been fully registered with driver core */
@@ -137,12 +138,12 @@ static inline void gameport_set_drvdata(struct gameport *gameport, void *data)
*/
static inline int gameport_pin_driver(struct gameport *gameport)
{
- return down_interruptible(&gameport->drv_sem);
+ return mutex_lock_interruptible(&gameport->drv_mutex);
}
static inline void gameport_unpin_driver(struct gameport *gameport)
{
- up(&gameport->drv_sem);
+ mutex_unlock(&gameport->drv_mutex);
}
void __gameport_register_driver(struct gameport_driver *drv, struct module *owner);