[PATCH] sysctl: remove unused "context" param

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 files changed, 55 insertions, 76 deletions

diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index c1d9fc8f1a..ee677ced7b 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -223,7 +223,7 @@ static int cmode_procctl(ctl_table *ctl, int write, struct file *filp,
 
 static int cmode_sysctl(ctl_table *table, int __user *name, int nlen,
                         void __user *oldval, size_t __user *oldlenp,
-                        void __user *newval, size_t newlen, void **context)
+                        void __user *newval, size_t newlen)
 {
         if (oldval && oldlenp) {
                 size_t oldlen;
@@ -326,7 +326,7 @@ static int p0_procctl(ctl_table *ctl, int write, struct file *filp,
 
 static int p0_sysctl(ctl_table *table, int __user *name, int nlen,
                      void __user *oldval, size_t __user *oldlenp,
-                     void __user *newval, size_t newlen, void **context)
+                     void __user *newval, size_t newlen)
 {
         if (oldval && oldlenp) {
                 size_t oldlen;
@@ -370,7 +370,7 @@ static int cm_procctl(ctl_table *ctl, int write, struct file *filp,
 
 static int cm_sysctl(ctl_table *table, int __user *name, int nlen,
                      void __user *oldval, size_t __user *oldlenp,
-                     void __user *newval, size_t newlen, void **context)
+                     void __user *newval, size_t newlen)
 {
         if (oldval && oldlenp) {
                 size_t oldlen;
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index da35d45554..12878359f2 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -40,12 +40,12 @@ 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;
         mutex_lock(&lasat_info_mutex);
         r = sysctl_string(table, name,
-                          nlen, oldval, oldlenp, newval, newlen, context);
+                          nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -119,11 +119,11 @@ 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;
         mutex_lock(&lasat_info_mutex);
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -139,14 +139,14 @@ 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;
         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) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
@@ -251,13 +251,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
 
 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;
 
         mutex_lock(&lasat_info_mutex);
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
         if (r < 0) {
                 mutex_unlock(&lasat_info_mutex);
                 return r;
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 4a673f5397..2433d6fc68 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -225,8 +225,7 @@ out:
 
 static int vsyscall_sysctl_nostrat(ctl_table *t, int __user *name, int nlen,
                                 void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen,
-                                void **context)
+                                void __user *newval, size_t newlen)
 {
         return -ENOSYS;
 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 092a01cc02..13d0b1350a 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1203,7 +1203,7 @@ static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
 
 static int uuid_strategy(ctl_table *table, int __user *name, int nlen,
                          void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen, void **context)
+                         void __user *newval, size_t newlen)
 {
         unsigned char tmp_uuid[16], *uuid;
         unsigned int len;
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 94316a98e0..6d8846e7be 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -918,8 +918,7 @@ typedef struct ctl_table ctl_table;
 
 typedef int ctl_handler (ctl_table *table, int __user *name, int nlen,
                          void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen, 
-                         void **context);
+                         void __user *newval, size_t newlen);
 
 typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
                           void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -950,7 +949,7 @@ extern int do_sysctl (int __user *name, int nlen,
 extern int do_sysctl_strategy (ctl_table *table, 
                                int __user *name, int nlen,
                                void __user *oldval, size_t __user *oldlenp,
-                               void __user *newval, size_t newlen, void ** context);
+                               void __user *newval, size_t newlen);
 
 extern ctl_handler sysctl_string;
 extern ctl_handler sysctl_intvec;
diff --git a/include/net/ip.h b/include/net/ip.h
index 83cb9ac555..053f02b5cb 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -376,8 +376,7 @@ int ipv4_doint_and_flush(ctl_table *ctl, int write,
                          size_t *lenp, loff_t *ppos);
 int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen,
                                   void __user *oldval, size_t __user *oldlenp,
-                                  void __user *newval, size_t newlen, 
-                                  void **context);
+                                  void __user *newval, size_t newlen);
 #ifdef CONFIG_PROC_FS
 extern int ip_misc_proc_init(void);
 #endif
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 215461f18d..c818f87122 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -368,7 +368,7 @@ static inline void sctp_sysctl_register(void) { return; }
 static inline void sctp_sysctl_unregister(void) { return; }