From 887bb14eb3e677ced1cffe623e7de80832d0e8f1 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 9 Nov 2012 14:04:50 +1100 Subject: [PATCH] procfs: use kbasename() Signed-off-by: Andy Shevchenko Signed-off-by: Andrew Morton --- fs/proc/proc_devtree.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index df7dd08d4391..3d9fd6674c71 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include "internal.h" @@ -195,11 +196,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); -- 2.39.5