aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-04 19:12:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 19:54:21 -0400
commit8091b895b76f690aa2f6689b6ed602f07525a938 (patch)
tree8885f760435f5c4b63636069a7b77a63130764ba
parent647f010bff6795b3e85c2b5a7768c0594a049ab0 (diff)
fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul
Remove obsolete simple_strtoul in ncp_getopt Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Petr Vandrovec <petr@vandrovec.name> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ncpfs/getopt.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/ncpfs/getopt.c b/fs/ncpfs/getopt.c
index 03ffde1f44d6..344889cd120e 100644
--- a/fs/ncpfs/getopt.c
+++ b/fs/ncpfs/getopt.c
@@ -53,15 +53,14 @@ int ncp_getopt(const char *caller, char **options, const struct ncp_option *opts
53 return -EINVAL; 53 return -EINVAL;
54 } 54 }
55 if (opts->has_arg & OPT_INT) { 55 if (opts->has_arg & OPT_INT) {
56 char* v; 56 int rc = kstrtoul(val, 0, value);
57 57
58 *value = simple_strtoul(val, &v, 0); 58 if (rc) {
59 if (!*v) { 59 pr_info("%s: invalid numeric value in %s=%s\n",
60 return opts->val; 60 caller, token, val);
61 return rc;
61 } 62 }
62 pr_info("%s: invalid numeric value in %s=%s\n", 63 return opts->val;
63 caller, token, val);
64 return -EDOM;
65 } 64 }
66 if (opts->has_arg & OPT_STRING) { 65 if (opts->has_arg & OPT_STRING) {
67 return opts->val; 66 return opts->val;