From: Ingo Molnar <mingo@elte.hu>

Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/istallion.c         |    1 -
 drivers/char/nwflash.c           |   11 ++++++-----
 drivers/char/stallion.c          |    1 -
 drivers/char/watchdog/pcwd_usb.c |    7 ++++---
 char/amiserial.c                 |    0 
 char/esp.c                       |    0 
 6 files changed, 10 insertions(+), 10 deletions(-)

diff -puN drivers/char/amiserial.c~sem2mutex-drivers-char drivers/char/amiserial.c
diff -puN drivers/char/esp.c~sem2mutex-drivers-char drivers/char/esp.c
diff -puN drivers/char/istallion.c~sem2mutex-drivers-char drivers/char/istallion.c
--- devel/drivers/char/istallion.c~sem2mutex-drivers-char	2006-01-14 18:46:16.000000000 -0800
+++ devel-akpm/drivers/char/istallion.c	2006-01-14 18:47:12.000000000 -0800
@@ -181,7 +181,6 @@ static struct tty_driver	*stli_serial;
  *	is already swapping a shared buffer won't make things any worse.
  */
 static char			*stli_tmpwritebuf;
-static DECLARE_MUTEX(stli_tmpwritesem);
 
 #define	STLI_TXBUFSIZE		4096
 
diff -puN drivers/char/nwflash.c~sem2mutex-drivers-char drivers/char/nwflash.c
--- devel/drivers/char/nwflash.c~sem2mutex-drivers-char	2006-01-14 18:46:16.000000000 -0800
+++ devel-akpm/drivers/char/nwflash.c	2006-01-14 18:46:16.000000000 -0800
@@ -27,6 +27,7 @@
 #include <linux/rwsem.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
+#include <linux/mutex.h>
 
 #include <asm/hardware/dec21285.h>
 #include <asm/io.h>
@@ -56,7 +57,7 @@ static int gbWriteEnable;
 static int gbWriteBase64Enable;
 static volatile unsigned char *FLASH_BASE;
 static int gbFlashSize = KFLASH_SIZE;
-static DECLARE_MUTEX(nwflash_sem);
+static DEFINE_MUTEX(nwflash_mutex);
 
 extern spinlock_t gpio_lock;
 
@@ -140,7 +141,7 @@ static ssize_t flash_read(struct file *f
 		/*
 		 * We now lock against reads and writes. --rmk
 		 */
-		if (down_interruptible(&nwflash_sem))
+		if (mutex_lock_interruptible(&nwflash_mutex))
 			return -ERESTARTSYS;
 
 		ret = copy_to_user(buf, (void *)(FLASH_BASE + p), count);
@@ -149,7 +150,7 @@ static ssize_t flash_read(struct file *f
 			*ppos += count;
 		} else
 			ret = -EFAULT;
-		up(&nwflash_sem);
+		mutex_unlock(&nwflash_mutex);
 	}
 	return ret;
 }
@@ -188,7 +189,7 @@ static ssize_t flash_write(struct file *
 	/*
 	 * We now lock against reads and writes. --rmk
 	 */
-	if (down_interruptible(&nwflash_sem))
+	if (mutex_lock_interruptible(&nwflash_mutex))
 		return -ERESTARTSYS;
 
 	written = 0;
@@ -277,7 +278,7 @@ static ssize_t flash_write(struct file *
 	 */
 	leds_event(led_release);
 
-	up(&nwflash_sem);
+	mutex_unlock(&nwflash_mutex);
 
 	return written;
 }
diff -puN drivers/char/stallion.c~sem2mutex-drivers-char drivers/char/stallion.c
--- devel/drivers/char/stallion.c~sem2mutex-drivers-char	2006-01-14 18:46:16.000000000 -0800
+++ devel-akpm/drivers/char/stallion.c	2006-01-14 18:48:10.000000000 -0800
@@ -148,7 +148,6 @@ static struct tty_driver	*stl_serial;
  *	is already swapping a shared buffer won't make things any worse.
  */
 static char			*stl_tmpwritebuf;
-static DECLARE_MUTEX(stl_tmpwritesem);
 
 /*
  *	Define a local default termios struct. All ports will be created
diff -puN drivers/char/watchdog/pcwd_usb.c~sem2mutex-drivers-char drivers/char/watchdog/pcwd_usb.c
--- devel/drivers/char/watchdog/pcwd_usb.c~sem2mutex-drivers-char	2006-01-14 18:46:16.000000000 -0800
+++ devel-akpm/drivers/char/watchdog/pcwd_usb.c	2006-01-14 18:46:16.000000000 -0800
@@ -42,6 +42,7 @@
 #include <linux/completion.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
+#include <linux/mutex.h>
 
 
 #ifdef CONFIG_USB_DEBUG
@@ -143,7 +144,7 @@ struct usb_pcwd_private {
 static struct usb_pcwd_private *usb_pcwd_device;
 
 /* prevent races between open() and disconnect() */
-static DECLARE_MUTEX (disconnect_sem);
+static DEFINE_MUTEX(disconnect_mutex);
 
 /* local function prototypes */
 static int usb_pcwd_probe	(struct usb_interface *interface, const struct usb_device_id *id);
@@ -723,7 +724,7 @@ static void usb_pcwd_disconnect(struct u
 	struct usb_pcwd_private *usb_pcwd;
 
 	/* prevent races with open() */
-	down (&disconnect_sem);
+	mutex_lock(&disconnect_mutex);
 
 	usb_pcwd = usb_get_intfdata (interface);
 	usb_set_intfdata (interface, NULL);
@@ -749,7 +750,7 @@ static void usb_pcwd_disconnect(struct u
 
 	cards_found--;
 
-	up (&disconnect_sem);
+	mutex_unlock(&disconnect_mutex);
 
 	printk(KERN_INFO PFX "USB PC Watchdog disconnected\n");
 }
_