Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / arch / mips / lasat / sysctl.c

diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 699ab1886ceba8deeff05f626e23597a8b560ee8..389336c4ecc5b85b1966384f7e232944376a9aa3 100644 (file)
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -30,7 +30,9 @@
 #include <linux/net.h>
 #include <linux/inet.h>
 #include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
+
+#include <asm/time.h>
 
 #include "sysctl.h"
 #include "ds1603.h"
@@ -43,6 +45,7 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
                void *newval, size_t newlen)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
        r = sysctl_string(table, name,
                          nlen, oldval, oldlenp, newval, newlen);
@@ -50,10 +53,10 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
-       if (newval && newlen) {
+       if (newval && newlen)
                lasat_write_eeprom_info();
-       }
        mutex_unlock(&lasat_info_mutex);
+
        return 1;
 }
 
@@ -63,14 +66,16 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
                       void *buffer, size_t *lenp, loff_t *ppos)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
        r = proc_dostring(table, write, filp, buffer, lenp, ppos);
-       if ( (!write) || r) {
+       if ((!write) || r) {
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
        lasat_write_eeprom_info();
        mutex_unlock(&lasat_info_mutex);
+
        return 0;
 }
 
@@ -79,14 +84,16 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp,
                       void *buffer, size_t *lenp, loff_t *ppos)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
-       if ( (!write) || r) {
+       if ((!write) || r) {
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
        lasat_write_eeprom_info();
        mutex_unlock(&lasat_info_mutex);
+
        return 0;
 }
 
@@ -98,20 +105,22 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
                       void *buffer, size_t *lenp, loff_t *ppos)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
        if (!write) {
-               rtctmp = ds1603_read();
+               rtctmp = read_persistent_clock();
                /* check for time < 0 and set to 0 */
                if (rtctmp < 0)
                        rtctmp = 0;
        }
        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
-       if ( (!write) || r) {
+       if ((!write) || r) {
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
-       ds1603_set(rtctmp);
+       rtc_mips_set_mmss(rtctmp);
        mutex_unlock(&lasat_info_mutex);
+
        return 0;
 }
 #endif
@@ -122,16 +131,17 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
                    void *newval, size_t newlen)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
        if (r < 0) {
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
-       if (newval && newlen) {
+       if (newval && newlen)
                lasat_write_eeprom_info();
-       }
        mutex_unlock(&lasat_info_mutex);
+
        return 1;
 }
 
@@ -142,8 +152,9 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
                    void *newval, size_t newlen)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
-       rtctmp = ds1603_read();
+       rtctmp = read_persistent_clock();
        if (rtctmp < 0)
                rtctmp = 0;
        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
@@ -151,10 +162,10 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
-       if (newval && newlen) {
-               ds1603_set(rtctmp);
-       }
+       if (newval && newlen)
+               rtc_mips_set_mmss(rtctmp);
        mutex_unlock(&lasat_info_mutex);
+
        return 1;
 }
 #endif
@@ -171,20 +182,21 @@ void update_bcastaddr(void)
                ~lasat_board_info.li_eeprom_info.netmask;
 
        sprintf(lasat_bcastaddr, "%d.%d.%d.%d",
-                       (ip      ) & 0xff,
+                       (ip)       & 0xff,
                        (ip >>  8) & 0xff,
                        (ip >> 16) & 0xff,
                        (ip >> 24) & 0xff);
 }
 
 static char proc_lasat_ipbuf[32];
+
 /* Parsing of IP address */
 int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                       void *buffer, size_t *lenp, loff_t *ppos)
 {
-       int len;
-        unsigned int ip;
+       unsigned int ip;
        char *p, c;
+       int len;
 
        if (!table->data || !table->maxlen || !*lenp ||
            (*ppos && !write)) {
@@ -197,7 +209,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                len = 0;
                p = buffer;
                while (len < *lenp) {
-                       if(get_user(c, p++)) {
+                       if (get_user(c, p++)) {
                                mutex_unlock(&lasat_info_mutex);
                                return -EFAULT;
                        }
@@ -207,8 +219,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                }
                if (len >= sizeof(proc_lasat_ipbuf)-1)
                        len = sizeof(proc_lasat_ipbuf) - 1;
-               if (copy_from_user(proc_lasat_ipbuf, buffer, len))
-               {
+               if (copy_from_user(proc_lasat_ipbuf, buffer, len)) {
                        mutex_unlock(&lasat_info_mutex);
                        return -EFAULT;
                }
@@ -221,7 +232,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
        } else {
                ip = *(unsigned int *)(table->data);
                sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d",
-                       (ip      ) & 0xff,
+                       (ip)       & 0xff,
                        (ip >>  8) & 0xff,
                        (ip >> 16) & 0xff,
                        (ip >> 24) & 0xff);
@@ -229,12 +240,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
                if (len > *lenp)
                        len = *lenp;
                if (len)
-                       if(copy_to_user(buffer, proc_lasat_ipbuf, len)) {
+                       if (copy_to_user(buffer, proc_lasat_ipbuf, len)) {
                                mutex_unlock(&lasat_info_mutex);
                                return -EFAULT;
                        }
                if (len < *lenp) {
-                       if(put_user('\n', ((char *) buffer) + len)) {
+                       if (put_user('\n', ((char *) buffer) + len)) {
                                mutex_unlock(&lasat_info_mutex);
                                return -EFAULT;
                        }
@@ -245,6 +256,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
        }
        update_bcastaddr();
        mutex_unlock(&lasat_info_mutex);
+
        return 0;
 }
 #endif /* defined(CONFIG_INET) */
@@ -262,10 +274,9 @@ static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
                return r;
        }
 
-       if (newval && newlen)
-       {
+       if (newval && newlen) {
                if (name && *name == LASAT_PRID)
-                       lasat_board_info.li_eeprom_info.prid = *(int*)newval;
+                       lasat_board_info.li_eeprom_info.prid = *(int *)newval;
 
                lasat_write_eeprom_info();
                lasat_init_board_info();
@@ -279,21 +290,24 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
                       void *buffer, size_t *lenp, loff_t *ppos)
 {
        int r;
+
        mutex_lock(&lasat_info_mutex);
        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
-       if ( (!write) || r) {
+       if ((!write) || r) {
                mutex_unlock(&lasat_info_mutex);
                return r;
        }
-       if (filp && filp->f_path.dentry)
-       {
+       if (filp && filp->f_path.dentry) {
                if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
-                       lasat_board_info.li_eeprom_info.prid = lasat_board_info.li_prid;
+                       lasat_board_info.li_eeprom_info.prid =
+                               lasat_board_info.li_prid;
                if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
-                       lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
+                       lasat_board_info.li_eeprom_info.debugaccess =
+                               lasat_board_info.li_debugaccess;
        }
        lasat_write_eeprom_info();
        mutex_unlock(&lasat_info_mutex);
+
        return 0;
 }
 
@@ -371,7 +385,8 @@ static ctl_table lasat_table[] = {
                .ctl_name       = CTL_UNNUMBERED,
                .procname       = "passwd_hash",
                .data           = &lasat_board_info.li_eeprom_info.passwd_hash,
-               .maxlen         = sizeof(lasat_board_info.li_eeprom_info.passwd_hash),
+               .maxlen         =
+                       sizeof(lasat_board_info.li_eeprom_info.passwd_hash),
                .mode           = 0600,
                .proc_handler   = &proc_dolasatstring,
                .strategy       = &sysctl_lasatstring