tracing: Replace strict_strto* with kstrto*

 * remove old string conversions with kstrto*

Link: http://lkml.kernel.org/r/20120926200838.GC1244@0x90.at
Signed-off-by: Daniel Walter <sahne@0x90.at>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 9dcf15d38380356a2288ec97b098c002d9bca01d..60ad606dc85f5745f1be82492a497975cd4c9991 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4381,7 +4381,7 @@ ftrace_pid_write(struct file *filp, const char __user *ubuf,
        if (strlen(tmp) == 0)
                return 1;
 
-       ret = strict_strtol(tmp, 10, &val);
+       ret = kstrtol(tmp, 10, &val);
        if (ret < 0)
                return ret;
 

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 31e4f55773f1c4e1959feffca13f6eb121b24e5f..f6928edacd6d87af8a9c75162620ae4a142550a9 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -431,7 +431,7 @@ static int __init set_tracing_thresh(char *str)
 
        if (!str)
                return 0;
-       ret = strict_strtoul(str, 0, &threshold);
+       ret = kstrtoul(str, 0, &threshold);
        if (ret < 0)
                return 0;
        tracing_thresh = threshold * 1000;

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index c154797a7ff7afa80f5d79571eae87fb609eec19..e5b0ca8b8d4ddc7a666a14c86bcf0a024046a7a8 100644 (file)
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1000,9 +1000,9 @@ static int init_pred(struct filter_parse_state *ps,
                }
        } else {
                if (field->is_signed)
-                       ret = strict_strtoll(pred->regex.pattern, 0, &val);
+                       ret = kstrtoll(pred->regex.pattern, 0, &val);
                else
-                       ret = strict_strtoull(pred->regex.pattern, 0, &val);
+                       ret = kstrtoull(pred->regex.pattern, 0, &val);
                if (ret) {
                        parse_error(ps, FILT_ERR_ILLEGAL_INTVAL, 0);
                        return -EINVAL;

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 507a7a9630bf06a8f69c5e4dbe1224716574acd3..618dcf8bdb87046880f5ceefb0c14ef5e3fb2d1f 100644 (file)
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -366,7 +366,7 @@ ftrace_trace_onoff_callback(struct ftrace_hash *hash,
         * We use the callback data field (which is a pointer)
         * as our counter.
         */
-       ret = strict_strtoul(number, 0, (unsigned long *)&count);
+       ret = kstrtoul(number, 0, (unsigned long *)&count);
        if (ret)
                return ret;
 

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 1a2117043bb140d06b366d8d6e0798bb69fcad26..5a3c533ef0607bb8b43b7db2ea36619b6fd635ba 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -444,7 +444,7 @@ static int create_trace_probe(int argc, char **argv)
                        return -EINVAL;
                }
                /* an address specified */
-               ret = strict_strtoul(&argv[1][0], 0, (unsigned long *)&addr);
+               ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);
                if (ret) {
                        pr_info("Failed to parse address.\n");
                        return ret;

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index daa9980153af8d0626b1124f729d67ef2f0da9f9..412e959709b4a12ae927a083d8b57917b8f2ad8c 100644 (file)
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -441,7 +441,7 @@ static const struct fetch_type *find_fetch_type(const char *type)
                        goto fail;
 
                type++;
-               if (strict_strtoul(type, 0, &bs))
+               if (kstrtoul(type, 0, &bs))
                        goto fail;
 
                switch (bs) {
@@ -501,8 +501,8 @@ int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset)
 
        tmp = strchr(symbol, '+');
        if (tmp) {
-               /* skip sign because strict_strtol doesn't accept '+' */
-               ret = strict_strtoul(tmp + 1, 0, offset);
+               /* skip sign because kstrtoul doesn't accept '+' */
+               ret = kstrtoul(tmp + 1, 0, offset);
                if (ret)
                        return ret;
 
@@ -533,7 +533,7 @@ static int parse_probe_vars(char *arg, const struct fetch_type *t,
                        else
                                ret = -EINVAL;
                } else if (isdigit(arg[5])) {
-                       ret = strict_strtoul(arg + 5, 10, &param);
+                       ret = kstrtoul(arg + 5, 10, &param);
                        if (ret || param > PARAM_MAX_STACK)
                                ret = -EINVAL;
                        else {
@@ -579,7 +579,7 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t,
 
        case '@':       /* memory or symbol */
                if (isdigit(arg[1])) {
-                       ret = strict_strtoul(arg + 1, 0, &param);
+                       ret = kstrtoul(arg + 1, 0, &param);
                        if (ret)
                                break;
 
@@ -597,14 +597,14 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t,
                break;
 
        case '+':       /* deref memory */
-               arg++;  /* Skip '+', because strict_strtol() rejects it. */
+               arg++;  /* Skip '+', because kstrtol() rejects it. */
        case '-':
                tmp = strchr(arg, '(');
                if (!tmp)
                        break;
 
                *tmp = '\0';
-               ret = strict_strtol(arg, 0, &offset);
+               ret = kstrtol(arg, 0, &offset);
 
                if (ret)
                        break;

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 03003cd7dd962d1ca31b2574f9d09f77a74f47a4..4ff9ca4f359a45ea08300940809b65c3c2db753d 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -252,7 +252,7 @@ static int create_trace_uprobe(int argc, char **argv)
        if (ret)
                goto fail_address_parse;
 
-       ret = strict_strtoul(arg, 0, &offset);
+       ret = kstrtoul(arg, 0, &offset);
        if (ret)
                goto fail_address_parse;