From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: Andrew Morton <akpm@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>, Al Viro <viro@ZenIV.linux.org.uk>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 5/8] drivers/base/core.c: Use strreplace
Date: Tue, 9 Jun 2015 01:26:53 +0200 [thread overview]
Message-ID: <1433806017-10823-6-git-send-email-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <1433806017-10823-1-git-send-email-linux@rasmusvillemoes.dk>
This eliminates a little .text and avoids repeating the strchr call
when we meet a '!' (which will happen at least once).
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
v2: Avoid ugly (char *) cast.
drivers/base/core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 21d13038534e..dafae6d2f7ac 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1303,12 +1303,11 @@ const char *device_get_devnode(struct device *dev,
return dev_name(dev);
/* replace '!' in the name with '/' */
- *tmp = kstrdup(dev_name(dev), GFP_KERNEL);
- if (!*tmp)
+ s = kstrdup(dev_name(dev), GFP_KERNEL);
+ if (!s)
return NULL;
- while ((s = strchr(*tmp, '!')))
- s[0] = '/';
- return *tmp;
+ strreplace(s, '!', '/');
+ return *tmp = s;
}
/**
--
2.1.3
next prev parent reply other threads:[~2015-06-08 23:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-08 23:26 [PATCH v2 0/8] Introduce strreplace Rasmus Villemoes
2015-06-08 23:26 ` [PATCH v2 1/8] lib: string: " Rasmus Villemoes
2015-06-09 0:00 ` Joe Perches
2015-06-09 7:17 ` Rasmus Villemoes
2015-06-08 23:26 ` [PATCH v2 2/8] kernel/trace/trace_events_filter.c: Use strreplace Rasmus Villemoes
2015-06-08 23:26 ` [PATCH v2 3/8] blktrace: use strreplace in do_blk_trace_setup Rasmus Villemoes
2015-06-09 3:05 ` Jens Axboe
2015-06-08 23:26 ` [PATCH v2 4/8] lib/kobject.c: Use strreplace Rasmus Villemoes
2015-06-08 23:26 ` Rasmus Villemoes [this message]
2015-06-08 23:26 ` [PATCH v2 6/8] drivers/md/md.c: " Rasmus Villemoes
2015-06-09 21:17 ` Neil Brown
2015-06-08 23:26 ` [PATCH v2 7/8] fs/jbd2/journal.c: " Rasmus Villemoes
2015-06-08 23:26 ` [PATCH v2 8/8] fs/ext4/super.c: Use strreplace in ext4_fill_super Rasmus Villemoes
2015-06-09 0:55 ` [PATCH v2 0/8] Introduce strreplace Theodore Ts'o
2015-06-09 7:25 ` Rasmus Villemoes
2015-06-09 21:02 ` Andrew Morton
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=1433806017-10823-6-git-send-email-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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
all inboxes | Powered by JetHome®