Merge branch 'master'

2 files changed, 8 insertions, 33 deletions

diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 1ef477f4469c..afd322185bbf 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -24,7 +24,6 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("PC Speaker beeper driver");
 MODULE_LICENSE("GPL");
 
-static struct platform_device *pcspkr_platform_device;
 static DEFINE_SPINLOCK(i8253_beep_lock);
 
 static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
@@ -135,35 +134,11 @@ static struct platform_driver pcspkr_platform_driver = {
 
 static int __init pcspkr_init(void)
 {
-        int err;
-
-        err = platform_driver_register(&pcspkr_platform_driver);
-        if (err)
-                return err;
-
-        pcspkr_platform_device = platform_device_alloc("pcspkr", -1);
-        if (!pcspkr_platform_device) {
-                err = -ENOMEM;
-                goto err_unregister_driver;
-        }
-
-        err = platform_device_add(pcspkr_platform_device);
-        if (err)
-                goto err_free_device;
-
-        return 0;
-
- err_free_device:
-        platform_device_put(pcspkr_platform_device);
- err_unregister_driver:
-        platform_driver_unregister(&pcspkr_platform_driver);
-
-        return err;
+        return platform_driver_register(&pcspkr_platform_driver);
 }
 
 static void __exit pcspkr_exit(void)
 {
-        platform_device_unregister(pcspkr_platform_device);
         platform_driver_unregister(&pcspkr_platform_driver);
 }
 
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 546ed9b4901d..d723e9ad7c41 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -194,7 +194,7 @@ static int uinput_open(struct inode *inode, struct file *file)
         if (!newdev)
                 return -ENOMEM;
 
-        init_MUTEX(&newdev->sem);
+        mutex_init(&newdev->mutex);
         spin_lock_init(&newdev->requests_lock);
         init_waitqueue_head(&newdev->requests_waitq);
         init_waitqueue_head(&newdev->waitq);
@@ -340,7 +340,7 @@ static ssize_t uinput_write(struct file *file, const char __user *buffer, size_t
         struct uinput_device *udev = file->private_data;
         int retval;
 
-        retval = down_interruptible(&udev->sem);
+        retval = mutex_lock_interruptible(&udev->mutex);
         if (retval)
                 return retval;
 
@@ -348,7 +348,7 @@ static ssize_t uinput_write(struct file *file, const char __user *buffer, size_t
                         uinput_inject_event(udev, buffer, count) :
                         uinput_setup_device(udev, buffer, count);
 
-        up(&udev->sem);
+        mutex_unlock(&udev->mutex);
 
         return retval;
 }
@@ -369,7 +369,7 @@ static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count,
         if (retval)
                 return retval;
 
-        retval = down_interruptible(&udev->sem);
+        retval = mutex_lock_interruptible(&udev->mutex);
         if (retval)
                 return retval;
 
@@ -388,7 +388,7 @@ static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count,
         }
 
  out:
-        up(&udev->sem);
+        mutex_unlock(&udev->mutex);
 
         return retval;
 }
@@ -439,7 +439,7 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
         udev = file->private_data;
 
-        retval = down_interruptible(&udev->sem);
+        retval = mutex_lock_interruptible(&udev->mutex);
         if (retval)
                 return retval;
 
@@ -589,7 +589,7 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         }
 
  out:
-        up(&udev->sem);
+        mutex_unlock(&udev->mutex);
         return retval;
 }