diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-06-04 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-06 15:54:08 -0400 |
commit | f7b41276b6b07f47c5f5212fa244385b0e3aaa30 (patch) | |
tree | a5c48de78a236e836da7d3b26e999224c975cc11 /drivers/misc/isl29003.c | |
parent | 4cd5773a2ae6facdde3f563087a4cc50f00d9530 (diff) |
misc: replace strict_strtoul() with kstrtoul()
The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/isl29003.c')
-rw-r--r-- | drivers/misc/isl29003.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c index c5145b3fcce8..e3183f26216b 100644 --- a/drivers/misc/isl29003.c +++ b/drivers/misc/isl29003.c | |||
@@ -208,7 +208,11 @@ static ssize_t isl29003_store_range(struct device *dev, | |||
208 | unsigned long val; | 208 | unsigned long val; |
209 | int ret; | 209 | int ret; |
210 | 210 | ||
211 | if ((strict_strtoul(buf, 10, &val) < 0) || (val > 3)) | 211 | ret = kstrtoul(buf, 10, &val); |
212 | if (ret) | ||
213 | return ret; | ||
214 | |||
215 | if (val > 3) | ||
212 | return -EINVAL; | 216 | return -EINVAL; |
213 | 217 | ||
214 | ret = isl29003_set_range(client, val); | 218 | ret = isl29003_set_range(client, val); |
@@ -239,7 +243,11 @@ static ssize_t isl29003_store_resolution(struct device *dev, | |||
239 | unsigned long val; | 243 | unsigned long val; |
240 | int ret; | 244 | int ret; |
241 | 245 | ||
242 | if ((strict_strtoul(buf, 10, &val) < 0) || (val > 3)) | 246 | ret = kstrtoul(buf, 10, &val); |
247 | if (ret) | ||
248 | return ret; | ||
249 | |||
250 | if (val > 3) | ||
243 | return -EINVAL; | 251 | return -EINVAL; |
244 | 252 | ||
245 | ret = isl29003_set_resolution(client, val); | 253 | ret = isl29003_set_resolution(client, val); |
@@ -267,7 +275,11 @@ static ssize_t isl29003_store_mode(struct device *dev, | |||
267 | unsigned long val; | 275 | unsigned long val; |
268 | int ret; | 276 | int ret; |
269 | 277 | ||
270 | if ((strict_strtoul(buf, 10, &val) < 0) || (val > 2)) | 278 | ret = kstrtoul(buf, 10, &val); |
279 | if (ret) | ||
280 | return ret; | ||
281 | |||
282 | if (val > 2) | ||
271 | return -EINVAL; | 283 | return -EINVAL; |
272 | 284 | ||
273 | ret = isl29003_set_mode(client, val); | 285 | ret = isl29003_set_mode(client, val); |
@@ -298,7 +310,11 @@ static ssize_t isl29003_store_power_state(struct device *dev, | |||
298 | unsigned long val; | 310 | unsigned long val; |
299 | int ret; | 311 | int ret; |
300 | 312 | ||
301 | if ((strict_strtoul(buf, 10, &val) < 0) || (val > 1)) | 313 | ret = kstrtoul(buf, 10, &val); |
314 | if (ret) | ||
315 | return ret; | ||
316 | |||
317 | if (val > 1) | ||
302 | return -EINVAL; | 318 | return -EINVAL; |
303 | 319 | ||
304 | ret = isl29003_set_power_state(client, val); | 320 | ret = isl29003_set_power_state(client, val); |