aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-31 17:59:16 -0400
committerJiri Kosina <jkosina@suse.cz>2013-08-20 06:56:26 -0400
commit0ab943bf5624b2cbb63ce4fa870a7ab76bd732f6 (patch)
treeefd3319e23afb00143f51aa2d2b31fd2f01dca30
parent5f5e39a152fb89e97253d5112df12d6a397beb2f (diff)
Documentation: 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> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rwxr-xr-xDocumentation/target/tcm_mod_builder.py2
-rw-r--r--Documentation/trace/ftrace.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index 3fe0d812dcec..54d29c1320ed 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -300,7 +300,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
300 buf += " int ret;\n\n" 300 buf += " int ret;\n\n"
301 buf += " if (strstr(name, \"tpgt_\") != name)\n" 301 buf += " if (strstr(name, \"tpgt_\") != name)\n"
302 buf += " return ERR_PTR(-EINVAL);\n" 302 buf += " return ERR_PTR(-EINVAL);\n"
303 buf += " if (strict_strtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n" 303 buf += " if (kstrtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n"
304 buf += " return ERR_PTR(-EINVAL);\n\n" 304 buf += " return ERR_PTR(-EINVAL);\n\n"
305 buf += " tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n" 305 buf += " tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n"
306 buf += " if (!tpg) {\n" 306 buf += " if (!tpg) {\n"
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt
index b937c6e2163c..ea2d35d64d26 100644
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
@@ -735,7 +735,7 @@ Here are the available options:
735 function as well as the function being traced. 735 function as well as the function being traced.
736 736
737 print-parent: 737 print-parent:
738 bash-4000 [01] 1477.606694: simple_strtoul <-strict_strtoul 738 bash-4000 [01] 1477.606694: simple_strtoul <-kstrtoul
739 739
740 noprint-parent: 740 noprint-parent:
741 bash-4000 [01] 1477.606694: simple_strtoul 741 bash-4000 [01] 1477.606694: simple_strtoul
@@ -759,7 +759,7 @@ Here are the available options:
759 latency-format option is enabled. 759 latency-format option is enabled.
760 760
761 bash 4000 1 0 00000000 00010a95 [58127d26] 1720.415ms \ 761 bash 4000 1 0 00000000 00010a95 [58127d26] 1720.415ms \
762 (+0.000ms): simple_strtoul (strict_strtoul) 762 (+0.000ms): simple_strtoul (kstrtoul)
763 763
764 raw - This will display raw numbers. This option is best for 764 raw - This will display raw numbers. This option is best for
765 use with user applications that can translate the raw 765 use with user applications that can translate the raw