Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bcd83ea6cbfee54e33d1527b87538dc99ca2137b

Authored by Daniel Walter
Committed by Steven Rostedt
1 parent 95d18aa2b6
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 7 changed files with 14 additions and 14 deletions Side-by-side Diff

kernel/trace/ftrace.c
Diff comments   View file @ bcd83ea
... ... @@ -4381,7 +4381,7 @@
4381 4381 if (strlen(tmp) == 0)
4382 4382 return 1;
4383 4383  
4384   - ret = strict_strtol(tmp, 10, &val);
  4384 + ret = kstrtol(tmp, 10, &val);
4385 4385 if (ret < 0)
4386 4386 return ret;
4387 4387  
kernel/trace/trace.c
Diff comments   View file @ bcd83ea
... ... @@ -431,7 +431,7 @@
431 431  
432 432 if (!str)
433 433 return 0;
434   - ret = strict_strtoul(str, 0, &threshold);
  434 + ret = kstrtoul(str, 0, &threshold);
435 435 if (ret < 0)
436 436 return 0;
437 437 tracing_thresh = threshold * 1000;
kernel/trace/trace_events_filter.c
Diff comments   View file @ bcd83ea
... ... @@ -1000,9 +1000,9 @@
1000 1000 }
1001 1001 } else {
1002 1002 if (field->is_signed)
1003   - ret = strict_strtoll(pred->regex.pattern, 0, &val);
  1003 + ret = kstrtoll(pred->regex.pattern, 0, &val);
1004 1004 else
1005   - ret = strict_strtoull(pred->regex.pattern, 0, &val);
  1005 + ret = kstrtoull(pred->regex.pattern, 0, &val);
1006 1006 if (ret) {
1007 1007 parse_error(ps, FILT_ERR_ILLEGAL_INTVAL, 0);
1008 1008 return -EINVAL;
kernel/trace/trace_functions.c
Diff comments   View file @ bcd83ea
... ... @@ -366,7 +366,7 @@
366 366 * We use the callback data field (which is a pointer)
367 367 * as our counter.
368 368 */
369   - ret = strict_strtoul(number, 0, (unsigned long *)&count);
  369 + ret = kstrtoul(number, 0, (unsigned long *)&count);
370 370 if (ret)
371 371 return ret;
372 372  
kernel/trace/trace_kprobe.c
Diff comments   View file @ bcd83ea
... ... @@ -444,7 +444,7 @@
444 444 return -EINVAL;
445 445 }
446 446 /* an address specified */
447   - ret = strict_strtoul(&argv[1][0], 0, (unsigned long *)&addr);
  447 + ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);
448 448 if (ret) {
449 449 pr_info("Failed to parse address.\n");
450 450 return ret;
kernel/trace/trace_probe.c
Diff comments   View file @ bcd83ea
... ... @@ -441,7 +441,7 @@
441 441 goto fail;
442 442  
443 443 type++;
444   - if (strict_strtoul(type, 0, &bs))
  444 + if (kstrtoul(type, 0, &bs))
445 445 goto fail;
446 446  
447 447 switch (bs) {
... ... @@ -501,8 +501,8 @@
501 501  
502 502 tmp = strchr(symbol, '+');
503 503 if (tmp) {
504   - /* skip sign because strict_strtol doesn't accept '+' */
505   - ret = strict_strtoul(tmp + 1, 0, offset);
  504 + /* skip sign because kstrtoul doesn't accept '+' */
  505 + ret = kstrtoul(tmp + 1, 0, offset);
506 506 if (ret)
507 507 return ret;
508 508  
... ... @@ -533,7 +533,7 @@
533 533 else
534 534 ret = -EINVAL;
535 535 } else if (isdigit(arg[5])) {
536   - ret = strict_strtoul(arg + 5, 10, &param);
  536 + ret = kstrtoul(arg + 5, 10, &param);
537 537 if (ret || param > PARAM_MAX_STACK)
538 538 ret = -EINVAL;
539 539 else {
... ... @@ -579,7 +579,7 @@
579 579  
580 580 case '@': /* memory or symbol */
581 581 if (isdigit(arg[1])) {
582   - ret = strict_strtoul(arg + 1, 0, &param);
  582 + ret = kstrtoul(arg + 1, 0, &param);
583 583 if (ret)
584 584 break;
585 585  
586 586  
... ... @@ -597,14 +597,14 @@
597 597 break;
598 598  
599 599 case '+': /* deref memory */
600   - arg++; /* Skip '+', because strict_strtol() rejects it. */
  600 + arg++; /* Skip '+', because kstrtol() rejects it. */
601 601 case '-':
602 602 tmp = strchr(arg, '(');
603 603 if (!tmp)
604 604 break;
605 605  
606 606 *tmp = '\0';
607   - ret = strict_strtol(arg, 0, &offset);
  607 + ret = kstrtol(arg, 0, &offset);
608 608  
609 609 if (ret)
610 610 break;
kernel/trace/trace_uprobe.c
Diff comments   View file @ bcd83ea
... ... @@ -252,7 +252,7 @@
252 252 if (ret)
253 253 goto fail_address_parse;
254 254  
255   - ret = strict_strtoul(arg, 0, &offset);
  255 + ret = kstrtoul(arg, 0, &offset);
256 256 if (ret)
257 257 goto fail_address_parse;
258 258