Pull video into test branch

[linux-drm-fsl-dcu.git] / arch / mips / lasat / sysctl.c

diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 8ff43a1c1e99c43f8cbbf5f49310f448b5fc87b4..12878359f2c883673950f0e90ec2da01732c543d 100644 (file)
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -20,7 +20,6 @@
 #include <linux/types.h>
 #include <asm/lasat/lasat.h>
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/stddef.h>
@@ -30,30 +29,31 @@
 #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,
                void *oldval, size_t *oldlenp,
-               void *newval, size_t newlen, void **context)
+               void *newval, size_t newlen)
 {
        int r;
-       down(&lasat_info_sem);
+       mutex_lock(&lasat_info_mutex);
        r = sysctl_string(table, name,
-                         nlen, oldval, oldlenp, newval, newlen, context);
+                         nlen, oldval, oldlenp, newval, newlen);
        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 +63,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 +79,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 +98,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 +107,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
@@ -119,19 +119,19 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
 /* Sysctl for setting the IP addresses */
 int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
                    void *oldval, size_t *oldlenp,
-                   void *newval, size_t newlen, void **context)
+                   void *newval, size_t newlen)
 {
        int r;
-       down(&lasat_info_sem);
-       r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+       mutex_lock(&lasat_info_mutex);
+       r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
        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;
 }
 
@@ -139,22 +139,22 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
 /* Same for RTC */
 int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
                    void *oldval, size_t *oldlenp,
-                   void *newval, size_t newlen, void **context)
+                   void *newval, size_t newlen)
 {
        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);
+       r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
        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 +192,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 +209,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 +230,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,22 +244,21 @@ 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) */
 
 static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
                                     void *oldval, size_t *oldlenp,
-                                    void *newval, size_t newlen,
-                                    void **context)
+                                    void *newval, size_t newlen)
 {
        int r;
 
-       down(&lasat_info_sem);
-       r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+       mutex_lock(&lasat_info_mutex);
+       r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
        if (r < 0) {
-               up(&lasat_info_sem);
+               mutex_unlock(&lasat_info_mutex);
                return r;
        }
 
@@ -271,7 +270,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,21 +279,21 @@ 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)
+       if (filp && filp->f_path.dentry)
        {
-               if (!strcmp(filp->f_dentry->d_name.name, "prid"))
+               if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
                        lasat_board_info.li_eeprom_info.prid = lasat_board_info.li_prid;
-               if (!strcmp(filp->f_dentry->d_name.name, "debugaccess"))
+               if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
                        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;
 }