diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/lasat/sysctl.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index da35d4555491..12878359f2c8 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
@@ -40,12 +40,12 @@ static DEFINE_MUTEX(lasat_info_mutex); | |||
40 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
42 | void *oldval, size_t *oldlenp, | 42 | void *oldval, size_t *oldlenp, |
43 | void *newval, size_t newlen, void **context) | 43 | void *newval, size_t newlen) |
44 | { | 44 | { |
45 | int r; | 45 | int r; |
46 | mutex_lock(&lasat_info_mutex); | 46 | mutex_lock(&lasat_info_mutex); |
47 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
48 | nlen, oldval, oldlenp, newval, newlen, context); | 48 | nlen, oldval, oldlenp, newval, newlen); |
49 | if (r < 0) { | 49 | if (r < 0) { |
50 | mutex_unlock(&lasat_info_mutex); | 50 | mutex_unlock(&lasat_info_mutex); |
51 | return r; | 51 | return r; |
@@ -119,11 +119,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | |||
119 | /* Sysctl for setting the IP addresses */ | 119 | /* Sysctl for setting the IP addresses */ |
120 | int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, | 120 | int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, |
121 | void *oldval, size_t *oldlenp, | 121 | void *oldval, size_t *oldlenp, |
122 | void *newval, size_t newlen, void **context) | 122 | void *newval, size_t newlen) |
123 | { | 123 | { |
124 | int r; | 124 | int r; |
125 | mutex_lock(&lasat_info_mutex); | 125 | mutex_lock(&lasat_info_mutex); |
126 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context); | 126 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
127 | if (r < 0) { | 127 | if (r < 0) { |
128 | mutex_unlock(&lasat_info_mutex); | 128 | mutex_unlock(&lasat_info_mutex); |
129 | return r; | 129 | return r; |
@@ -139,14 +139,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, | |||
139 | /* Same for RTC */ | 139 | /* Same for RTC */ |
140 | int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen, | 140 | int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen, |
141 | void *oldval, size_t *oldlenp, | 141 | void *oldval, size_t *oldlenp, |
142 | void *newval, size_t newlen, void **context) | 142 | void *newval, size_t newlen) |
143 | { | 143 | { |
144 | int r; | 144 | int r; |
145 | mutex_lock(&lasat_info_mutex); | 145 | mutex_lock(&lasat_info_mutex); |
146 | rtctmp = ds1603_read(); | 146 | rtctmp = ds1603_read(); |
147 | if (rtctmp < 0) | 147 | if (rtctmp < 0) |
148 | rtctmp = 0; | 148 | rtctmp = 0; |
149 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context); | 149 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
150 | if (r < 0) { | 150 | if (r < 0) { |
151 | mutex_unlock(&lasat_info_mutex); | 151 | mutex_unlock(&lasat_info_mutex); |
152 | return r; | 152 | return r; |
@@ -251,13 +251,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
251 | 251 | ||
252 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 252 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, |
253 | void *oldval, size_t *oldlenp, | 253 | void *oldval, size_t *oldlenp, |
254 | void *newval, size_t newlen, | 254 | void *newval, size_t newlen) |
255 | void **context) | ||
256 | { | 255 | { |
257 | int r; | 256 | int r; |
258 | 257 | ||
259 | mutex_lock(&lasat_info_mutex); | 258 | mutex_lock(&lasat_info_mutex); |
260 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context); | 259 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
261 | if (r < 0) { | 260 | if (r < 0) { |
262 | mutex_unlock(&lasat_info_mutex); | 261 | mutex_unlock(&lasat_info_mutex); |
263 | return r; | 262 | return r; |