From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbbFDJjm (ORCPT ); Thu, 4 Jun 2015 05:39:42 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:35307 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114AbbFDJhc (ORCPT ); Thu, 4 Jun 2015 05:37:32 -0400 From: Rasmus Villemoes To: Andrew Morton , Greg Kroah-Hartman Cc: Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [RFC/PATCH 5/8] drivers/base/core.c: Use strreplace Date: Thu, 4 Jun 2015 11:37:12 +0200 Message-Id: <1433410636-26812-6-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1433410636-26812-1-git-send-email-linux@rasmusvillemoes.dk> References: <1433410636-26812-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This eliminates a local variable and a little .text. Signed-off-by: Rasmus Villemoes --- drivers/base/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 21d13038534e..01f2c1214f06 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1282,8 +1282,6 @@ const char *device_get_devnode(struct device *dev, umode_t *mode, kuid_t *uid, kgid_t *gid, const char **tmp) { - char *s; - *tmp = NULL; /* the device type may provide a specific name */ @@ -1306,8 +1304,7 @@ const char *device_get_devnode(struct device *dev, *tmp = kstrdup(dev_name(dev), GFP_KERNEL); if (!*tmp) return NULL; - while ((s = strchr(*tmp, '!'))) - s[0] = '/'; + strreplace((char *)*tmp, '!', '/'); return *tmp; } -- 2.1.3