sem2mutex input
PATCH 1/1 sem2mutex input
Hi,
Relative to Linus' git tree.
Cheers,
Jes
Use mutex instead of semaphore.
Signed-off-by Jes Sorensen <[email protected]>
----
drivers/input/input.c | 15 ++++++++------- include/linux/input.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/input/input.c +8 -7
@@ -21,6 +21,7 @@#include <linux/interrupt.h> #include <linux/poll.h> #include <linux/device.h> +#include <linux/mutex.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );MODULE_DESCRIPTION ("Input core" );
@@ -224,7 +225,7 @@struct input_dev *dev = handle->dev;int err; - err =down_interruptible (&dev->sem); + err =mutex_lock_interruptible (&dev->mutex);if (err)return err;
@@ -236,7 +237,7 @@if (err) handle->open--; -up (&dev->sem); +mutex_unlock (&dev->mutex);return err; }
@@ -255,13 +256,13 @@input_release_device (handle); -down (&dev->sem); +mutex_lock (&dev->mutex);if (!--dev->users && dev->close) dev->close (dev); handle->open--; -up (&dev->sem); +mutex_unlock (&dev->mutex); }static void input_link_handle (struct input_handle *handle)
@@ -512,13 +513,13 @@struct input_dev *input_dev =to_input_dev (dev); \int retval; \ \ - retval =down_interruptible (&input_dev->sem); \ + retval =mutex_lock_interruptible (&input_dev->mutex); \if (retval) \return retval; \ \ retval =sprintf (buf,"%s\n" , input_dev->name ? input_dev->name :"" ); \ \ -up (&input_dev->sem); \ +mutex_unlock (&input_dev->mutex); \ \return retval; \ } \
@@ -771,7 +772,7 @@return -EINVAL ; } -init_MUTEX (&dev->sem); +mutex_init (&dev->mutex);set_bit (EV_SYN , dev->evbit);/*
include/linux/input.h +1 -1
@@ -929,7 +929,7 @@struct input_handle *grab; -struct semaphore sem;/* serializes open and close operations */ +struct mutex mutex;/* serializes open and close operations */ unsigned int users;struct class_device cdev;