mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, Joe Perches <joe@perches.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCHv2 5/6] procfs: reuse kbasename() functionality
Date: Wed,  3 Oct 2012 11:43:02 +0300	[thread overview]
Message-ID: <1349253783-21612-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1349253783-21612-1-git-send-email-andriy.shevchenko@linux.intel.com>

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 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 df7dd08..3d9fd66 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -13,6 +13,7 @@
 #include <linux/of.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 #include <asm/prom.h>
 #include <asm/uaccess.h>
 #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);
-- 
1.7.10.4


  parent reply	other threads:[~2012-10-03  8:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-03  8:42 [PATCHv2 0/6] lib/string: introduce kbasename helper Andy Shevchenko
2012-10-03  8:42 ` [PATCHv2 1/6] string: introduce helper to get base file name from given path Andy Shevchenko
2012-10-03  8:42 ` [PATCHv2 2/6] lib: dynamic_debug: reuse kbasename() Andy Shevchenko
2012-10-03  8:43 ` [PATCHv2 3/6] staging: rts_pstor: " Andy Shevchenko
2012-10-03  9:35   ` Kirill A. Shutemov
2012-10-03  8:43 ` [PATCHv2 4/6] mm: reuse kbasename() functionality Andy Shevchenko
2012-10-03  8:43 ` Andy Shevchenko [this message]
2012-10-03  8:43 ` [PATCHv2 6/6] trace: " Andy Shevchenko
2012-10-03  8:53   ` [PATCHv2.5] " Andy Shevchenko
2012-10-05 16:49     ` Steven Rostedt
2012-10-05 17:02       ` Andy Shevchenko
2012-10-05 17:12         ` Steven Rostedt
2012-10-05 17:14           ` Steven Rostedt
2012-10-05 17:21           ` Andy Shevchenko
2012-10-05 17:46             ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349253783-21612-6-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome