[PATCH] sem2mutex: misc static one-file mutexes

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: Dave Jones <davej@codemonkey.org.uk>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jens Axboe <axboe@suse.de>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Acked-by: Alasdair G Kergon <agk@redhat.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 32 insertions, 31 deletions

diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 8ff43a1c1e99..e3d5aaa90f0d 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -30,12 +30,13 @@
 #include <linux/string.h>
 #include <linux/net.h>
 #include <linux/inet.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 
 #include "sysctl.h"
 #include "ds1603.h"
 
-static DECLARE_MUTEX(lasat_info_sem);
+static DEFINE_MUTEX(lasat_info_mutex);
 
 /* Strategy function to write EEPROM after changing string entry */
 int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
@@ -43,17 +44,17 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
                 void *newval, size_t newlen, void **context)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         r = sysctl_string(table, name,
                           nlen, oldval, oldlenp, newval, newlen, context);
         if (r < 0) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         if (newval && newlen) {
                 lasat_write_eeprom_info();
         }
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 1;
 }
 
@@ -63,14 +64,14 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
                        void *buffer, size_t *lenp, loff_t *ppos)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         r = proc_dostring(table, write, filp, buffer, lenp, ppos);
         if ( (!write) || r) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         lasat_write_eeprom_info();
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 0;
 }
 
@@ -79,14 +80,14 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp,
                        void *buffer, size_t *lenp, loff_t *ppos)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
         if ( (!write) || r) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         lasat_write_eeprom_info();
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 0;
 }
 
@@ -98,7 +99,7 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
                        void *buffer, size_t *lenp, loff_t *ppos)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         if (!write) {
                 rtctmp = ds1603_read();
                 /* check for time < 0 and set to 0 */
@@ -107,11 +108,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
         }
         r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
         if ( (!write) || r) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         ds1603_set(rtctmp);
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 0;
 }
 #endif
@@ -122,16 +123,16 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
                     void *newval, size_t newlen, void **context)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
         if (r < 0) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         if (newval && newlen) {
                 lasat_write_eeprom_info();
         }
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 1;
 }
 
@@ -142,19 +143,19 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
                     void *newval, size_t newlen, void **context)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         rtctmp = ds1603_read();
         if (rtctmp < 0)
                 rtctmp = 0;
         r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
         if (r < 0) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         if (newval && newlen) {
                 ds1603_set(rtctmp);
         }
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 1;
 }
 #endif
@@ -192,13 +193,13 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                 return 0;
         }
 
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         if (write) {
                 len = 0;
                 p = buffer;
                 while (len < *lenp) {
                         if(get_user(c, p++)) {
-                                up(&lasat_info_sem);
+                                mutex_unlock(&lasat_info_mutex);
                                 return -EFAULT;
                         }
                         if (c == 0 || c == '\n')
@@ -209,7 +210,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                         len = sizeof(proc_lasat_ipbuf) - 1;
                 if (copy_from_user(proc_lasat_ipbuf, buffer, len))
                 {
-                        up(&lasat_info_sem);
+                        mutex_unlock(&lasat_info_mutex);
                         return -EFAULT;
                 }
                 proc_lasat_ipbuf[len] = 0;
@@ -230,12 +231,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                         len = *lenp;
                 if (len)
                         if(copy_to_user(buffer, proc_lasat_ipbuf, len)) {
-                                up(&lasat_info_sem);
+                                mutex_unlock(&lasat_info_mutex);
                                 return -EFAULT;
                         }
                 if (len < *lenp) {
                         if(put_user('\n', ((char *) buffer) + len)) {
-                                up(&lasat_info_sem);
+                                mutex_unlock(&lasat_info_mutex);
                                 return -EFAULT;
                         }
                         len++;
@@ -244,7 +245,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                 *ppos += len;
         }
         update_bcastaddr();
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 0;
 }
 #endif /* defined(CONFIG_INET) */
@@ -256,10 +257,10 @@ static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
 {
         int r;
 
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
         if (r < 0) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
 
@@ -271,7 +272,7 @@ static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
                 lasat_write_eeprom_info();
                 lasat_init_board_info();
         }
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
 
         return 0;
 }
@@ -280,10 +281,10 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
                        void *buffer, size_t *lenp, loff_t *ppos)
 {
         int r;
-        down(&lasat_info_sem);
+        mutex_lock(&lasat_info_mutex);
         r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
         if ( (!write) || r) {
-                up(&lasat_info_sem);
+                mutex_unlock(&lasat_info_mutex);
                 return r;
         }
         if (filp && filp->f_dentry)
@@ -294,7 +295,7 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
                         lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
         }
         lasat_write_eeprom_info();
-        up(&lasat_info_sem);
+        mutex_unlock(&lasat_info_mutex);
         return 0;
 }