diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-23 18:57:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 10:21:04 -0400 |
| commit | 8d65af789f3e2cf4cfbdbf71a0f7a61ebcd41d38 (patch) | |
| tree | 121df3bfffc7853ac6d2c514ad514d4a748a0933 /arch/mips/lasat | |
| parent | c0d0787b6d47d9f4d5e8bd321921104e854a9135 (diff) | |
sysctl: remove "struct file *" argument of ->proc_handler
It's unused.
It isn't needed -- read or write flag is already passed and sysctl
shouldn't care about the rest.
It _was_ used in two places at arch/frv for some reason.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/lasat')
| -rw-r--r-- | arch/mips/lasat/sysctl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 3f04d4c406b..b3deed8db61 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
| @@ -56,12 +56,12 @@ int sysctl_lasatstring(ctl_table *table, | |||
| 56 | 56 | ||
| 57 | 57 | ||
| 58 | /* And the same for proc */ | 58 | /* And the same for proc */ |
| 59 | int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | 59 | int proc_dolasatstring(ctl_table *table, int write, |
| 60 | void *buffer, size_t *lenp, loff_t *ppos) | 60 | void *buffer, size_t *lenp, loff_t *ppos) |
| 61 | { | 61 | { |
| 62 | int r; | 62 | int r; |
| 63 | 63 | ||
| 64 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); | 64 | r = proc_dostring(table, write, buffer, lenp, ppos); |
| 65 | if ((!write) || r) | 65 | if ((!write) || r) |
| 66 | return r; | 66 | return r; |
| 67 | 67 | ||
| @@ -71,12 +71,12 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | /* proc function to write EEPROM after changing int entry */ | 73 | /* proc function to write EEPROM after changing int entry */ |
| 74 | int proc_dolasatint(ctl_table *table, int write, struct file *filp, | 74 | int proc_dolasatint(ctl_table *table, int write, |
| 75 | void *buffer, size_t *lenp, loff_t *ppos) | 75 | void *buffer, size_t *lenp, loff_t *ppos) |
| 76 | { | 76 | { |
| 77 | int r; | 77 | int r; |
| 78 | 78 | ||
| 79 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 79 | r = proc_dointvec(table, write, buffer, lenp, ppos); |
| 80 | if ((!write) || r) | 80 | if ((!write) || r) |
| 81 | return r; | 81 | return r; |
| 82 | 82 | ||
| @@ -89,7 +89,7 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
| 89 | static int rtctmp; | 89 | static int rtctmp; |
| 90 | 90 | ||
| 91 | /* proc function to read/write RealTime Clock */ | 91 | /* proc function to read/write RealTime Clock */ |
| 92 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 92 | int proc_dolasatrtc(ctl_table *table, int write, |
| 93 | void *buffer, size_t *lenp, loff_t *ppos) | 93 | void *buffer, size_t *lenp, loff_t *ppos) |
| 94 | { | 94 | { |
| 95 | struct timespec ts; | 95 | struct timespec ts; |
| @@ -102,7 +102,7 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | |||
| 102 | if (rtctmp < 0) | 102 | if (rtctmp < 0) |
| 103 | rtctmp = 0; | 103 | rtctmp = 0; |
| 104 | } | 104 | } |
| 105 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 105 | r = proc_dointvec(table, write, buffer, lenp, ppos); |
| 106 | if (r) | 106 | if (r) |
| 107 | return r; | 107 | return r; |
| 108 | 108 | ||
| @@ -154,7 +154,7 @@ int sysctl_lasat_rtc(ctl_table *table, | |||
| 154 | #endif | 154 | #endif |
| 155 | 155 | ||
| 156 | #ifdef CONFIG_INET | 156 | #ifdef CONFIG_INET |
| 157 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | 157 | int proc_lasat_ip(ctl_table *table, int write, |
| 158 | void *buffer, size_t *lenp, loff_t *ppos) | 158 | void *buffer, size_t *lenp, loff_t *ppos) |
| 159 | { | 159 | { |
| 160 | unsigned int ip; | 160 | unsigned int ip; |
| @@ -231,12 +231,12 @@ static int sysctl_lasat_prid(ctl_table *table, | |||
| 231 | return 0; | 231 | return 0; |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | int proc_lasat_prid(ctl_table *table, int write, struct file *filp, | 234 | int proc_lasat_prid(ctl_table *table, int write, |
| 235 | void *buffer, size_t *lenp, loff_t *ppos) | 235 | void *buffer, size_t *lenp, loff_t *ppos) |
| 236 | { | 236 | { |
| 237 | int r; | 237 | int r; |
| 238 | 238 | ||
| 239 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 239 | r = proc_dointvec(table, write, buffer, lenp, ppos); |
| 240 | if (r < 0) | 240 | if (r < 0) |
| 241 | return r; | 241 | return r; |
| 242 | if (write) { | 242 | if (write) { |
