16 files changed, 140 insertions, 130 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 5c69b86db624..6495411337d8 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -25,9 +25,6 @@ obj-$(CONFIG_CONNECTOR)		+= connector/
 obj-$(CONFIG_FB_I810)           += video/i810/
 obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 
-# we also need input/serio early so serio bus is initialized by the time
-# serial drivers start registering their serio ports
-obj-$(CONFIG_SERIO)             += input/serio/
 obj-y                           += serial/
 obj-$(CONFIG_PARPORT)           += parport/
 obj-y                           += base/ block/ misc/ mfd/ net/ media/
@@ -53,6 +50,7 @@ obj-$(CONFIG_TC)		+= tc/
 obj-$(CONFIG_USB)               += usb/
 obj-$(CONFIG_PCI)               += usb/
 obj-$(CONFIG_USB_GADGET)        += usb/gadget/
+obj-$(CONFIG_SERIO)             += input/serio/
 obj-$(CONFIG_GAMEPORT)          += input/gameport/
 obj-$(CONFIG_INPUT)             += input/
 obj-$(CONFIG_I2O)               += message/
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index b765a155c008..bcfd700829a1 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/sched.h>        /* HZ */
+#include <linux/mutex.h>
 
 /*#include <asm/io.h>*/
 
@@ -43,10 +44,10 @@ EXPORT_SYMBOL(gameport_start_polling);
 EXPORT_SYMBOL(gameport_stop_polling);
 
 /*
- * gameport_sem protects entire gameport subsystem and is taken
+ * gameport_mutex protects entire gameport subsystem and is taken
  * every time gameport port or driver registrered or unregistered.
  */
-static DECLARE_MUTEX(gameport_sem);
+static DEFINE_MUTEX(gameport_mutex);
 
 static LIST_HEAD(gameport_list);
 
@@ -342,7 +343,7 @@ static void gameport_handle_event(void)
         struct gameport_event *event;
         struct gameport_driver *gameport_drv;
 
-        down(&gameport_sem);
+        mutex_lock(&gameport_mutex);
 
         /*
          * Note that we handle only one event here to give swsusp
@@ -379,7 +380,7 @@ static void gameport_handle_event(void)
                 gameport_free_event(event);
         }
 
-        up(&gameport_sem);
+        mutex_unlock(&gameport_mutex);
 }
 
 /*
@@ -464,7 +465,7 @@ static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribut
         struct device_driver *drv;
         int retval;
 
-        retval = down_interruptible(&gameport_sem);
+        retval = mutex_lock_interruptible(&gameport_mutex);
         if (retval)
                 return retval;
 
@@ -484,7 +485,7 @@ static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribut
                 retval = -EINVAL;
         }
 
-        up(&gameport_sem);
+        mutex_unlock(&gameport_mutex);
 
         return retval;
 }
@@ -521,7 +522,7 @@ static void gameport_init_port(struct gameport *gameport)
 
         __module_get(THIS_MODULE);
 
-        init_MUTEX(&gameport->drv_sem);
+        mutex_init(&gameport->drv_mutex);
         device_initialize(&gameport->dev);
         snprintf(gameport->dev.bus_id, sizeof(gameport->dev.bus_id),
                  "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);
@@ -661,10 +662,10 @@ void __gameport_register_port(struct gameport *gameport, struct module *owner)
  */
 void gameport_unregister_port(struct gameport *gameport)
 {
-        down(&gameport_sem);
+        mutex_lock(&gameport_mutex);
         gameport_disconnect_port(gameport);
         gameport_destroy_port(gameport);
-        up(&gameport_sem);
+        mutex_unlock(&gameport_mutex);
 }
 
 
@@ -717,7 +718,7 @@ void gameport_unregister_driver(struct gameport_driver *drv)
 {
         struct gameport *gameport;
 
-        down(&gameport_sem);
+        mutex_lock(&gameport_mutex);
         drv->ignore = 1;        /* so gameport_find_driver ignores it */
 
 start_over:
@@ -731,7 +732,7 @@ start_over:
         }
 
         driver_unregister(&drv->driver);
-        up(&gameport_sem);
+        mutex_unlock(&gameport_mutex);
 }
 
 static int gameport_bus_match(struct device *dev, struct device_driver *drv)
@@ -743,9 +744,9 @@ static int gameport_bus_match(struct device *dev, struct device_driver *drv)
 
 static void gameport_set_drv(struct gameport *gameport, struct gameport_driver *drv)
 {
-        down(&gameport->drv_sem);
+        mutex_lock(&gameport->drv_mutex);
         gameport->drv = drv;
-        up(&gameport->drv_sem);
+        mutex_unlock(&gameport->drv_mutex);
 }
 
 int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode)
@@ -796,5 +797,5 @@ static void __exit gameport_exit(void)
         kthread_stop(gameport_task);
 }
 
-module_init(gameport_init);
+subsys_initcall(gameport_init);
 module_exit(gameport_exit);
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 4fe3da3c667a..3e22bb11ee05 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("Input core");
@@ -224,7 +225,7 @@ int input_open_device(struct input_handle *handle)
         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 @@ int input_open_device(struct input_handle *handle)
         if (err)
                 handle->open--;
 
-        up(&dev->sem);
+        mutex_unlock(&dev->mutex);
 
         return err;
 }
@@ -255,13 +256,13 @@ void input_close_device(struct input_handle *handle)
 
         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 @@ static ssize_t input_dev_show_##name(struct class_device *dev, char *buf)	\
         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;                                                          \
 }                                                                               \
@@ -790,7 +791,7 @@ int input_register_device(struct input_dev *dev)
                 return -EINVAL;
         }
 
-        init_MUTEX(&dev->sem);
+        mutex_init(&dev->mutex);
         set_bit(EV_SYN, dev->evbit);
 
         /*
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index ec55a29fc861..7249d324297b 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/mutex.h>
 
 #include <asm/system.h>
 #include <asm/amigahw.h>
@@ -52,7 +53,7 @@ MODULE_PARM_DESC(map, "Map of attached joysticks in form of <a>,<b> (default is
 __obsolete_setup("amijoy=");
 
 static int amijoy_used;
-static DECLARE_MUTEX(amijoy_sem);
+static DEFINE_MUTEX(amijoy_mutex);
 static struct input_dev *amijoy_dev[2];
 static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" };
 
@@ -85,7 +86,7 @@ static int amijoy_open(struct input_dev *dev)
 {
         int err;
 
-        err = down_interruptible(&amijoy_sem);
+        err = mutex_lock_interruptible(&amijoy_mutex);
         if (err)
                 return err;
 
@@ -97,16 +98,16 @@ static int amijoy_open(struct input_dev *dev)
 
         amijoy_used++;
 out:
-        up(&amijoy_sem);
+        mutex_unlock(&amijoy_mutex);
         return err;
 }
 
 static void amijoy_close(struct input_dev *dev)
 {
-        down(&amijoy_sem);
+        mutex_lock(&amijoy_mutex);
         if (!--amijoy_used)
                 free_irq(IRQ_AMIGA_VERTB, amijoy_interrupt);
-        up(&amijoy_sem);
+        mutex_unlock(&amijoy_mutex);
 }
 
 static int __init amijoy_init(void)
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index dcffc34f30c3..e61894685cb1 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/parport.h>
 #include <linux/input.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Atari, Amstrad, Commodore, Amiga, Sega, etc. joystick driver");
@@ -111,7 +112,7 @@ struct db9 {
         struct pardevice *pd;
         int mode;
         int used;
-        struct semaphore sem;
+        struct mutex mutex;
         char phys[DB9_MAX_DEVICES][32];
 };
 
@@ -525,7 +526,7 @@ static int db9_open(struct input_dev *dev)
         struct parport *port = db9->pd->port;
         int err;
 
-        err = down_interruptible(&db9->sem);
+        err = mutex_lock_interruptible(&db9->mutex);
         if (err)
                 return err;
 
@@ -539,7 +540,7 @@ static int db9_open(struct input_dev *dev)
                 mod_timer(&db9->timer, jiffies + DB9_REFRESH_TIME);
         }
 
-        up(&db9->sem);
+        mutex_unlock(&db9->mutex);
         return 0;
 }
 
@@ -548,14 +549,14 @@ static void db9_close(struct input_dev *dev)
         struct db9 *db9 = dev->private;
         struct parport *port = db9->pd->port;
 
-        down(&db9->sem);
+        mutex_lock(&db9->mutex);
         if (!--db9->used) {
                 del_timer_sync(&db9->timer);
                 parport_write_control(port, 0x00);
                 parport_data_forward(port);
                 parport_release(db9->pd);
         }
-        up(&db9->sem);
+        mutex_unlock(&db9->mutex);
 }
 
 static struct db9 __init *db9_probe(int parport, int mode)
@@ -603,7 +604,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
                 goto err_unreg_pardev;
         }
 
-        init_MUTEX(&db9->sem);
+        mutex_init(&db9->mutex);
         db9->pd = pd;
         db9->mode = mode;
         init_timer(&db9->timer);
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 900587acdb47..aa3ef89d8188 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/parport.h>
 #include <linux/input.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver");
@@ -83,7 +84,7 @@ struct gc {
         struct timer_list timer;
         unsigned char pads[GC_MAX + 1];
         int used;
-        struct semaphore sem;
+        struct mutex mutex;
         char phys[GC_MAX_DEVICES][32];
 };
 
@@ -552,7 +553,7 @@ static int gc_open(struct input_dev *dev)
         struct gc *gc = dev->private;
         int err;
 
-        err = down_interruptible(&gc->sem);
+        err = mutex_lock_interruptible(&gc->mutex);
         if (err)
                 return err;
 
@@ -562,7 +563,7 @@ static int gc_open(struct input_dev *dev)
                 mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME);
         }
 
-        up(&gc->sem);
+        mutex_unlock(&gc->mutex);
         return 0;
 }
 
@@ -570,13 +571,13 @@ static void gc_close(struct input_dev *dev)
 {
         struct gc *gc = dev->private;
 
-        down(&gc->sem);
+        mutex_lock(&gc->mutex);
         if (!--gc->used) {
                 del_timer_sync(&gc->timer);
                 parport_write_control(gc->pd->port, 0x00);
                 parport_release(gc->pd);
         }
-        up(&gc->sem);
+        mutex_unlock(&gc->mutex);
 }
 
 static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
@@ -693,7 +694,7 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
                 goto err_unreg_pardev;
         }
 
-        init_MUTEX(&gc->sem);
+        mutex_init(&gc->mutex);
         gc->pd = pd;
         init_timer(&gc->timer);
         gc->timer.data = (long) gc;
diff --git a/drivers/input/joystick/iforce/iforce-ff.c b/drivers/input/joystick/iforce/iforce-ff.c
index 4678b6dab43b..2b8e8456c9fa 100644
--- a/drivers/input/joystick/iforce/iforce-ff.c
+++ b/drivers/input/joystick/iforce/iforce-ff.c
@@ -42,14 +42,14 @@ static int make_magnitude_modifier(struct iforce* iforce,
         unsigned char data[3];
 
         if (!no_alloc) {
-                down(&iforce->mem_mutex);
+                mutex_lock(&iforce->mem_mutex);
                 if (allocate_resource(&(iforce->device_memory), mod_chunk, 2,
                         iforce->device_memory.start, iforce->device_memory.end, 2L,
                         NULL, NULL)) {
-                        up(&iforce->mem_mutex);
+                        mutex_unlock(&iforce->mem_mutex);
                         return -ENOMEM;
                 }
-                up(&iforce->mem_mutex);
+                mutex_unlock(&iforce->mem_mutex);
         }
 
         data[0] = LO(mod_chunk->start);
@@ -75,14 +75,14 @@ static int make_period_modifier(struct iforce* iforce,
         period = TIME_SCALE(period);
 
         if (!no_alloc) {
-                down(&iforce->mem_mutex);
+                mutex_lock(&iforce->mem_mutex);
                 if (allocate_resource(&(iforce->device_memory), mod_chunk, 0x0c,
                         iforce->device_memory.start, iforce->device_memory.end, 2L,
                         NULL, NULL)) {
-                        up(&iforce->mem_mutex);
+                        mutex_unlock(&iforce->mem_mutex);
                         return -ENOMEM;
                 }
-                up(&iforce->mem_mutex);
+                mutex_unlock(&iforce->mem_mutex);
         }
 
         data[0] = LO(mod_chunk->start);
@@ -115,14 +115,14 @@ static int make_envelope_modifier(struct iforce* iforce,
         fade_duration = TIME_SCALE(fade_duration);
 
         if (!no_alloc) {
-                down(&iforce->mem_mutex);
+                mutex_lock(&iforce->mem_mutex);
                 if (allocate_resource(&(iforce->device_memory), mod_chunk, 0x0e,
                         iforce->device_memory.start, iforce->device_memory.end, 2L,
                         NULL, NULL)) {
-                        up(&iforce->mem_mutex);
+                        mutex_unlock(&iforce->mem_mutex);
                         return -ENOMEM;
                 }
-                up(&iforce->mem_mutex);
+                mutex_unlock(&iforce->mem_mutex);
         }
 
         data[0] = LO(mod_chunk->start);
@@ -152,14 +152,14 @@ static int make_condition_modifier(struct iforce* iforce,
         unsigned char data[10];
 
         if (!no_alloc) {
-                down(&iforce->mem_mutex);
+                mutex_lock(&iforce->mem_mutex);
                 if (allocate_resource(&(iforce->device_memory), mod_chunk, 8,
                         iforce->device_memory.start, iforce->device_memory.end, 2L,
                         NULL, NULL)) {
-                        up(&iforce->mem_mutex);
+                        mutex_unlock(&iforce->mem_mutex);
                         return -ENOMEM;
                 }
-                up(&iforce->mem_mutex);
+                mutex_unlock(&iforce->mem_mutex);
         }
 
         data[0] = LO(mod_chunk->start);
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index b6bc04998047..ab0a26b924ca 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -350,7 +350,7 @@ int iforce_init_device(struct iforce *iforce)
 
         init_waitqueue_head(&iforce->wait);
         spin_lock_init(&iforce->xmit_lock);
-        init_MUTEX(&iforce->mem_mutex);
+        mutex_init(&iforce->mem_mutex);
         iforce->xmit.buf = iforce->xmit_data;
         iforce->dev = input_dev;
 
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 146f406b8f8a..668f24535ba0 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -37,7 +37,7 @@
 #include <linux/serio.h>
 #include <linux/config.h>
 #include <linux/circ_buf.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 /* This module provides arbitrary resource management routines.
  * I use it to manage the device's memory.
@@ -45,6 +45,7 @@
  */
 #include <linux/ioport.h>
 
+
 #define IFORCE_MAX_LENGTH       16
 
 /* iforce::bus */
@@ -146,7 +147,7 @@ struct iforce {
         wait_queue_head_t wait;
         struct resource device_memory;
         struct iforce_core_effect core_effects[FF_EFFECTS_MAX];
-        struct semaphore mem_mutex;
+        struct mutex mem_mutex;
 };
 
 /* Get hi and low bytes of a 16-bits int */
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index b154938e88a4..5570fd5487c7 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -37,6 +37,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("TurboGraFX parallel port interface driver");
@@ -86,7 +87,7 @@ static struct tgfx {
         char phys[TGFX_MAX_DEVICES][32];
         int sticks;
         int used;
-        struct semaphore sem;
+        struct mutex sem;
 } *tgfx_base[TGFX_MAX_PORTS];
 
 /*
@@ -128,7 +129,7 @@ static int tgfx_open(struct input_dev *dev)
         struct tgfx *tgfx = dev->private;
         int err;
 
-        err = down_interruptible(&tgfx->sem);
+        err = mutex_lock_interruptible(&tgfx->sem);
         if (err)
                 return err;
 
@@ -138,7 +139,7 @@ static int tgfx_open(struct input_dev *dev)
                 mod_timer(&tgfx->timer, jiffies + TGFX_REFRESH_TIME);
         }
 
-        up(&tgfx->sem);
+        mutex_unlock(&tgfx->sem);
         return 0;
 }
 
@@ -146,13 +147,13 @@ static void tgfx_close(struct input_dev *dev)
 {
         struct tgfx *tgfx = dev->private;
 
-        down(&tgfx->sem);
+        mutex_lock(&tgfx->sem);
         if (!--tgfx->used) {
                 del_timer_sync(&tgfx->timer);
                 parport_write_control(tgfx->pd->port, 0x00);
                 parport_release(tgfx->pd);
         }
-        up(&tgfx->sem);
+        mutex_unlock(&tgfx->sem);
 }
 
 
@@ -191,7 +192,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                 goto err_unreg_pardev;
         }
 
-        init_MUTEX(&tgfx->sem);
+        mutex_init(&tgfx->sem);
         tgfx->pd = pd;
         init_timer(&tgfx->timer);
         tgfx->timer.data = (long) tgfx;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index ffacf6eca5f5..b45981870c7a 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -27,6 +27,7 @@
 #include <linux/serio.h>
 #include <linux/workqueue.h>
 #include <linux/libps2.h>
+#include <linux/mutex.h>
 
 #define DRIVER_DESC     "AT and PS/2 keyboard driver"
 
@@ -216,7 +217,7 @@ struct atkbd {
         unsigned long time;
 
         struct work_struct event_work;
-        struct semaphore event_sem;
+        struct mutex event_mutex;
         unsigned long event_mask;
 };
 
@@ -449,7 +450,7 @@ static void atkbd_event_work(void *data)
         unsigned char param[2];
         int i, j;
 
-        down(&atkbd->event_sem);
+        mutex_lock(&atkbd->event_mutex);
 
         if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask)) {
                 param[0] = (test_bit(LED_SCROLLL, dev->led) ? 1 : 0)
@@ -480,7 +481,7 @@ static void atkbd_event_work(void *data)
                 ps2_command(&atkbd->ps2dev, param, ATKBD_CMD_SETREP);
         }
 
-        up(&atkbd->event_sem);
+        mutex_unlock(&atkbd->event_mutex);
 }
 
 /*
@@ -846,7 +847,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
         atkbd->dev = dev;
         ps2_init(&atkbd->ps2dev, serio);
         INIT_WORK(&atkbd->event_work, atkbd_event_work, atkbd);
-        init_MUTEX(&atkbd->event_sem);
+        mutex_init(&atkbd->event_mutex);
 
         switch (serio->id.type) {
 
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;
 }
 
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index ad6217467676..32d70ed8f41d 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -20,6 +20,8 @@
 #include <linux/serio.h>
 #include <linux/init.h>
 #include <linux/libps2.h>
+#include <linux/mutex.h>
+
 #include "psmouse.h"
 #include "synaptics.h"
 #include "logips2pp.h"
@@ -98,13 +100,13 @@ __obsolete_setup("psmouse_resetafter=");
 __obsolete_setup("psmouse_rate=");
 
 /*
- * psmouse_sem protects all operations changing state of mouse
+ * psmouse_mutex protects all operations changing state of mouse
  * (connecting, disconnecting, changing rate or resolution via
  * sysfs). We could use a per-device semaphore but since there
  * rarely more than one PS/2 mouse connected and since semaphore
  * is taken in "slow" paths it is not worth it.
  */
-static DECLARE_MUTEX(psmouse_sem);
+static DEFINE_MUTEX(psmouse_mutex);
 
 static struct workqueue_struct *kpsmoused_wq;
 
@@ -868,7 +870,7 @@ static void psmouse_resync(void *p)
         int failed = 0, enabled = 0;
         int i;
 
-        down(&psmouse_sem);
+        mutex_lock(&psmouse_mutex);
 
         if (psmouse->state != PSMOUSE_RESYNCING)
                 goto out;
@@ -948,7 +950,7 @@ static void psmouse_resync(void *p)
         if (parent)
                 psmouse_activate(parent);
  out:
-        up(&psmouse_sem);
+        mutex_unlock(&psmouse_mutex);
 }
 
 /*
@@ -974,14 +976,14 @@ static void psmouse_disconnect(struct serio *serio)
 
         sysfs_remove_group(&serio->dev.kobj, &psmouse_attribute_group);
 
-        down(&psmouse_sem);
+        mutex_lock(&psmouse_mutex);
 
         psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
 
         /* make sure we don't have a resync in progress */
-        up(&psmouse_sem);
+        mutex_unlock(&psmouse_mutex);
         flush_workqueue(kpsmoused_wq);
-        down(&psmouse_sem);
+        mutex_lock(&psmouse_mutex);
 
         if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
                 parent = serio_get_drvdata(serio->parent);
@@ -1004,7 +1006,7 @@ static void psmouse_disconnect(struct serio *serio)
         if (parent)
                 psmouse_activate(parent);
 
-        up(&psmouse_sem);
+        mutex_unlock(&psmouse_mutex);
 }
 
 static int psmouse_switch_protocol(struct psmouse *psmouse, struct psmouse_protocol *proto)
@@ -1076,7 +1078,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
         struct input_dev *input_dev;
         int retval = -ENOMEM;
 
-        down(&psmouse_sem);
+        mutex_lock(&psmouse_mutex);
 
         /*
          * If this is a pass-through port deactivate parent so the device
@@ -1144,7 +1146,7 @@ out:
         if (parent)
                 psmouse_activate(parent);
 
-        up(&psmouse_sem);
+        mutex_unlock(&psmouse_mutex);
         return retval;
 }
 
@@ -1161,7 +1163,7 @@ static int psmouse_reconnect(struct serio *serio)
                 return -1;
         }
 
-        down(&psmouse_sem);
+        mutex_lock(&psmouse_mutex);
 
         if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
                 parent = serio_get_drvdata(serio->parent);
@@ -1195,7 +1197,7 @@ out:
         if (parent)
                 psmouse_activate(parent);
 
-        up(&psmouse_sem);
+        mutex_unlock(&psmouse_mutex);
         return rc;
 }
 
@@ -1273,7 +1275,7 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
                 goto out_unpin;
         }
 
-        retval = down_interruptible(&psmouse_sem);
+        retval = mutex_lock_interruptible(&psmouse_mutex);
         if (retval)
                 goto out_unpin;
 
@@ -1281,7 +1283,7 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
 
         if (psmouse->state == PSMOUSE_IGNORE) {
                 retval = -ENODEV;
-                goto out_up;
+                goto out_unlock;
         }
 
         if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
@@ -1299,8 +1301,8 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev
         if (parent)
                 psmouse_activate(parent);
 
- out_up:
-        up(&psmouse_sem);
+ out_unlock:
+        mutex_unlock(&psmouse_mutex);
  out_unpin:
         serio_unpin_driver(serio);
         return retval;
@@ -1357,11 +1359,11 @@ static ssize_t psmouse_attr_set_protocol(struct psmouse *psmouse, void *data, co
                         return -EIO;
                 }
 
-                up(&psmouse_sem);
+                mutex_unlock(&psmouse_mutex);
                 serio_unpin_driver(serio);
                 serio_unregister_child_port(serio);
                 serio_pin_driver_uninterruptible(serio);
-                down(&psmouse_sem);
+                mutex_lock(&psmouse_mutex);
 
                 if (serio->drv != &psmouse_drv) {
                         input_free_device(new_dev);
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index d4c990f7c85e..79c97f94bcbd 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -84,7 +84,7 @@ void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout)
                 maxbytes = sizeof(ps2dev->cmdbuf);
         }
 
-        down(&ps2dev->cmd_sem);
+        mutex_lock(&ps2dev->cmd_mutex);
 
         serio_pause_rx(ps2dev->serio);
         ps2dev->flags = PS2_FLAG_CMD;
@@ -94,7 +94,7 @@ void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout)
         wait_event_timeout(ps2dev->wait,
                            !(ps2dev->flags & PS2_FLAG_CMD),
                            msecs_to_jiffies(timeout));
-        up(&ps2dev->cmd_sem);
+        mutex_unlock(&ps2dev->cmd_mutex);
 }
 
 /*
@@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
                 return -1;
         }
 
-        down(&ps2dev->cmd_sem);
+        mutex_lock(&ps2dev->cmd_mutex);
 
         serio_pause_rx(ps2dev->serio);
         ps2dev->flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0;
@@ -229,7 +229,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
         ps2dev->flags = 0;
         serio_continue_rx(ps2dev->serio);
 
-        up(&ps2dev->cmd_sem);
+        mutex_unlock(&ps2dev->cmd_mutex);
         return rc;
 }
 
@@ -281,7 +281,7 @@ int ps2_schedule_command(struct ps2dev *ps2dev, unsigned char *param, int comman
 
 void ps2_init(struct ps2dev *ps2dev, struct serio *serio)
 {
-        init_MUTEX(&ps2dev->cmd_sem);
+        mutex_init(&ps2dev->cmd_mutex);
         init_waitqueue_head(&ps2dev->wait);
         ps2dev->serio = serio;
 }
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 2f76813c3a64..966600779b70 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -34,6 +34,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Serio abstraction core");
@@ -52,10 +53,10 @@ EXPORT_SYMBOL(serio_rescan);
 EXPORT_SYMBOL(serio_reconnect);
 
 /*
- * serio_sem protects entire serio subsystem and is taken every time
+ * serio_mutex protects entire serio subsystem and is taken every time
  * serio port or driver registrered or unregistered.
  */
-static DECLARE_MUTEX(serio_sem);
+static DEFINE_MUTEX(serio_mutex);
 
 static LIST_HEAD(serio_list);
 
@@ -70,9 +71,9 @@ static int serio_connect_driver(struct serio *serio, struct serio_driver *drv)
 {
         int retval;
 
-        down(&serio->drv_sem);
+        mutex_lock(&serio->drv_mutex);
         retval = drv->connect(serio, drv);
-        up(&serio->drv_sem);
+        mutex_unlock(&serio->drv_mutex);
 
         return retval;
 }
@@ -81,20 +82,20 @@ static int serio_reconnect_driver(struct serio *serio)
 {
         int retval = -1;
 
-        down(&serio->drv_sem);
+        mutex_lock(&serio->drv_mutex);
         if (serio->drv && serio->drv->reconnect)
                 retval = serio->drv->reconnect(serio);
-        up(&serio->drv_sem);
+        mutex_unlock(&serio->drv_mutex);
 
         return retval;
 }
 
 static void serio_disconnect_driver(struct serio *serio)
 {
-        down(&serio->drv_sem);
+        mutex_lock(&serio->drv_mutex);
         if (serio->drv)
                 serio->drv->disconnect(serio);
-        up(&serio->drv_sem);
+        mutex_unlock(&serio->drv_mutex);
 }
 
 static int serio_match_port(const struct serio_device_id *ids, struct serio *serio)
@@ -272,7 +273,7 @@ static void serio_handle_event(void)
         struct serio_event *event;
         struct serio_driver *serio_drv;
 
-        down(&serio_sem);
+        mutex_lock(&serio_mutex);
 
         /*
          * Note that we handle only one event here to give swsusp
@@ -314,7 +315,7 @@ static void serio_handle_event(void)
                 serio_free_event(event);
         }
 
-        up(&serio_sem);
+        mutex_unlock(&serio_mutex);
 }
 
 /*
@@ -449,7 +450,7 @@ static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *
         struct device_driver *drv;
         int retval;
 
-        retval = down_interruptible(&serio_sem);
+        retval = mutex_lock_interruptible(&serio_mutex);
         if (retval)
                 return retval;
 
@@ -469,7 +470,7 @@ static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *
                 retval = -EINVAL;
         }
 
-        up(&serio_sem);
+        mutex_unlock(&serio_mutex);
 
         return retval;
 }
@@ -524,7 +525,7 @@ static void serio_init_port(struct serio *serio)
         __module_get(THIS_MODULE);
 
         spin_lock_init(&serio->lock);
-        init_MUTEX(&serio->drv_sem);
+        mutex_init(&serio->drv_mutex);
         device_initialize(&serio->dev);
         snprintf(serio->dev.bus_id, sizeof(serio->dev.bus_id),
                  "serio%ld", (long)atomic_inc_return(&serio_no) - 1);
@@ -661,10 +662,10 @@ void __serio_register_port(struct serio *serio, struct module *owner)
  */
 void serio_unregister_port(struct serio *serio)
 {
-        down(&serio_sem);
+        mutex_lock(&serio_mutex);
         serio_disconnect_port(serio);
         serio_destroy_port(serio);
-        up(&serio_sem);
+        mutex_unlock(&serio_mutex);
 }
 
 /*
@@ -672,17 +673,17 @@ void serio_unregister_port(struct serio *serio)
  */
 void serio_unregister_child_port(struct serio *serio)
 {
-        down(&serio_sem);
+        mutex_lock(&serio_mutex);
         if (serio->child) {
                 serio_disconnect_port(serio->child);
                 serio_destroy_port(serio->child);
         }
-        up(&serio_sem);
+        mutex_unlock(&serio_mutex);
 }
 
 /*
  * Submits register request to kseriod for subsequent execution.
- * Can be used when it is not obvious whether the serio_sem is
+ * Can be used when it is not obvious whether the serio_mutex is
  * taken or not and when delayed execution is feasible.
  */
 void __serio_unregister_port_delayed(struct serio *serio, struct module *owner)
@@ -765,7 +766,7 @@ void serio_unregister_driver(struct serio_driver *drv)
 {
         struct serio *serio;
 
-        down(&serio_sem);
+        mutex_lock(&serio_mutex);
         drv->manual_bind = 1;   /* so serio_find_driver ignores it */
 
 start_over:
@@ -779,7 +780,7 @@ start_over:
         }
 
         driver_unregister(&drv->driver);
-        up(&serio_sem);
+        mutex_unlock(&serio_mutex);
 }
 
 static void serio_set_drv(struct serio *serio, struct serio_driver *drv)
@@ -858,7 +859,7 @@ static int serio_resume(struct device *dev)
         return 0;
 }
 
-/* called from serio_driver->connect/disconnect methods under serio_sem */
+/* called from serio_driver->connect/disconnect methods under serio_mutex */
 int serio_open(struct serio *serio, struct serio_driver *drv)
 {
         serio_set_drv(serio, drv);
@@ -870,7 +871,7 @@ int serio_open(struct serio *serio, struct serio_driver *drv)
         return 0;
 }
 
-/* called from serio_driver->connect/disconnect methods under serio_sem */
+/* called from serio_driver->connect/disconnect methods under serio_mutex */
 void serio_close(struct serio *serio)
 {
         if (serio->close)
@@ -923,5 +924,5 @@ static void __exit serio_exit(void)
         kthread_stop(serio_task);
 }
 
-module_init(serio_init);
+subsys_initcall(serio_init);
 module_exit(serio_exit);
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 47e08de18d07..8734e7f75b7d 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -19,6 +19,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/wait.h>
+#include <linux/mutex.h>
 
 #define DRIVER_DESC     "Raw serio driver"
 
@@ -46,7 +47,7 @@ struct serio_raw_list {
         struct list_head node;
 };
 
-static DECLARE_MUTEX(serio_raw_sem);
+static DEFINE_MUTEX(serio_raw_mutex);
 static LIST_HEAD(serio_raw_list);
 static unsigned int serio_raw_no;
 
@@ -81,7 +82,7 @@ static int serio_raw_open(struct inode *inode, struct file *file)
         struct serio_raw_list *list;
         int retval = 0;
 
-        retval = down_interruptible(&serio_raw_sem);
+        retval = mutex_lock_interruptible(&serio_raw_mutex);
         if (retval)
                 return retval;
 
@@ -108,7 +109,7 @@ static int serio_raw_open(struct inode *inode, struct file *file)
         list_add_tail(&list->node, &serio_raw->list);
 
 out:
-        up(&serio_raw_sem);
+        mutex_unlock(&serio_raw_mutex);
         return retval;
 }
 
@@ -130,12 +131,12 @@ static int serio_raw_release(struct inode *inode, struct file *file)
         struct serio_raw_list *list = file->private_data;
         struct serio_raw *serio_raw = list->serio_raw;
 
-        down(&serio_raw_sem);
+        mutex_lock(&serio_raw_mutex);
 
         serio_raw_fasync(-1, file, 0);
         serio_raw_cleanup(serio_raw);
 
-        up(&serio_raw_sem);
+        mutex_unlock(&serio_raw_mutex);
         return 0;
 }
 
@@ -194,7 +195,7 @@ static ssize_t serio_raw_write(struct file *file, const char __user *buffer, siz
         int retval;
         unsigned char c;
 
-        retval = down_interruptible(&serio_raw_sem);
+        retval = mutex_lock_interruptible(&serio_raw_mutex);
         if (retval)
                 return retval;
 
@@ -219,7 +220,7 @@ static ssize_t serio_raw_write(struct file *file, const char __user *buffer, siz
         };
 
 out:
-        up(&serio_raw_sem);
+        mutex_unlock(&serio_raw_mutex);
         return written;
 }
 
@@ -280,7 +281,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
                 return -ENOMEM;
         }
 
-        down(&serio_raw_sem);
+        mutex_lock(&serio_raw_mutex);
 
         memset(serio_raw, 0, sizeof(struct serio_raw));
         snprintf(serio_raw->name, sizeof(serio_raw->name), "serio_raw%d", serio_raw_no++);
@@ -325,7 +326,7 @@ out_free:
         serio_set_drvdata(serio, NULL);
         kfree(serio_raw);
 out:
-        up(&serio_raw_sem);
+        mutex_unlock(&serio_raw_mutex);
         return err;
 }
 
@@ -350,7 +351,7 @@ static void serio_raw_disconnect(struct serio *serio)
 {
         struct serio_raw *serio_raw;
 
-        down(&serio_raw_sem);
+        mutex_lock(&serio_raw_mutex);
 
         serio_raw = serio_get_drvdata(serio);
 
@@ -361,7 +362,7 @@ static void serio_raw_disconnect(struct serio *serio)
         if (!serio_raw_cleanup(serio_raw))
                 wake_up_interruptible(&serio_raw->wait);
 
-        up(&serio_raw_sem);
+        mutex_unlock(&serio_raw_mutex);
 }
 
 static struct serio_device_id serio_raw_serio_ids[] = {