summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2012-12-17 16:01:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 17:15:17 -0800
commitf9a00e8738c209d95493cf97d3a82ab2655892e5 (patch)
tree5f47dbfa96d540d9fdf9fa3871a79e211d6f2b0f
parent2fbc57c53a815ea30b926dd7627897a02daae302 (diff)
downloadblackbird-op-linux-f9a00e8738c209d95493cf97d3a82ab2655892e5.tar.gz
blackbird-op-linux-f9a00e8738c209d95493cf97d3a82ab2655892e5.zip
procfs: use kbasename()
[yongjun_wei@trendmicro.com.cn: remove duplicated include] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/proc/proc_devtree.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index df7dd08d4391..de20ec480fa0 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -195,11 +195,7 @@ void proc_device_tree_add_node(struct device_node *np,
set_node_proc_entry(np, de);
for (child = NULL; (child = of_get_next_child(np, child));) {
/* Use everything after the last slash, or the full name */
- p = strrchr(child->full_name, '/');
- if (!p)
- p = child->full_name;
- else
- ++p;
+ p = kbasename(child->full_name);
if (duplicate_name(de, p))
p = fixup_name(np, de, p);
OpenPOWER on IntegriCloud