From patchwork Wed Jun 28 15:32:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 113956 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9016474vqr; Wed, 28 Jun 2023 08:35:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7iyAQLZehdXhSbD338OTVIPRlvtrIQrrfm4W4Z0MFcUkgBH4gXUXWrldchevfrmUMCMKn/ X-Received: by 2002:a05:6402:1d52:b0:514:a566:104a with SMTP id dz18-20020a0564021d5200b00514a566104amr29234841edb.3.1687966520184; Wed, 28 Jun 2023 08:35:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687966520; cv=none; d=google.com; s=arc-20160816; b=M/bG4cBC/jLDre56e1CLUE+M5iF635Y/0q6HSRtIbkYEYjtvUYnh4h97ZEbcr+IBF5 gTDOhv9ekfCUTrnRmm1Rdp9Oth7w77ZPz7SFMjMp/e7EkimmJqKErqn8Y0tx0hyQKDGM ILcEeNoyO49vhb+StsGEK2liwrG5Q1ShSxHH7s4mHhaESPiHoqfXK6nv2OtlV1ogZbv7 /Q+wT6ZqmlQuB20bH+Mu1g0/Lq/rh5I9STy00ZuxqvMIdZCx7DD7yhY0yWfLmH0HVGvG F4EKMGDomrD5NBAasMTgGqCmdRVCngyQj04BRNT08EbstK20CDTuTHe/hhXNyzJv+hs4 OwCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2MQj6d1/kDx2xp/Rki+4ttYSQXfljlMtGiTOIE0975U=; fh=XrA2ku+PA66OSRadqxacVu9ngzn45Ll5WReP+bMahIs=; b=lqDt5uhP73h98vfYq7WY0rcCUMSt94b4OUCTL1gDmriKKqmQ9Bb+Ixr3zHo5K71p3e bRrnYTRJo3nau3FnFDTsh3ZvemZPZUSdNWJ7hNjO6QbIoUqcmm7moubHWRUDjpGKE6Oi SQMHbmy2YB1WptK8riUACVxveI0X9RmbuD1cB+57RMIU67YoS00OMc9PiaGGpvmB/Zvz q10IG3wXrAJJbebnki7lGi7BBQRBIv+16HlCt+7fLTFkOHHZI+1hB4iuNATc0iQP+zEh Gd0Jw3fhBx9pnYUDNniRGj93Oa3Wu8MEONq1W9Wve9+Iq6Luc8SRXJyggPZYgs+i9Y96 edIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GApZaMPl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y14-20020aa7d50e000000b0051dacee1430si2044926edq.375.2023.06.28.08.34.55; Wed, 28 Jun 2023 08:35:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GApZaMPl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232394AbjF1Pcx (ORCPT + 99 others); Wed, 28 Jun 2023 11:32:53 -0400 Received: from mga02.intel.com ([134.134.136.20]:53515 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232234AbjF1Pc3 (ORCPT ); Wed, 28 Jun 2023 11:32:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687966348; x=1719502348; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1tDiKollzsfCXGV+rVmP0hmFqWtqHNqcUethxH+1FHg=; b=GApZaMPlGRGY8SSVi8X594qIiWkpDh388LSvIQOwJ9BNCe7uXIkjucry UXFZ2IPswT787HTNF72SSsVTaIVI2yHhQMu5yexveYM52A7jpfFP7CZnc P+0ixHmBDsdr2YGPzHiOHf6rK0V/Bi8i3PrO4MHv7xN62m+d6Dy+fU40l AajzU5Bim1k7H57pDq9JDWUfijSxl0YgSEObe3wN4W1ZrRJHLb/RvpqU6 7j4G0DLcRONI3yJSb/HlxTLv99m1y6D3avqpBsVc/4zDkceHsB81yIibG bdBUMfidqtaAOBIMuOCUqqAIG24lby+JvPTBHp9gmPxFWY3UfG4A6otqd Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="351666446" X-IronPort-AV: E=Sophos;i="6.01,165,1684825200"; d="scan'208";a="351666446" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2023 08:32:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="720270169" X-IronPort-AV: E=Sophos;i="6.01,165,1684825200"; d="scan'208";a="720270169" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 28 Jun 2023 08:32:13 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id ABFBB51E; Wed, 28 Jun 2023 18:32:14 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , Saravana Kannan , Andy Shevchenko , Stephen Boyd , Dario Binacchi , Tony Lindgren , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org Cc: "Rafael J. Wysocki" , Peter De Schrijver , Prashant Gaikwad , Michael Turquette , Thierry Reding , Jonathan Hunter , Tero Kristo , Andy Shevchenko Subject: [PATCH v1 4/4] clk: ti: Replace kstrdup() + strreplace() with kstrdup_and_replace() Date: Wed, 28 Jun 2023 18:32:11 +0300 Message-Id: <20230628153211.52988-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230628153211.52988-1-andriy.shevchenko@linux.intel.com> References: <20230628153211.52988-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769961181861092152?= X-GMAIL-MSGID: =?utf-8?q?1769961181861092152?= Replace open coded functionalify of kstrdup_and_replace() with a call. Signed-off-by: Andy Shevchenko --- drivers/clk/ti/clk.c | 4 ++-- drivers/clk/ti/clkctrl.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index 3d636938a739..1862958ab412 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -123,10 +124,9 @@ static struct device_node *ti_find_clock_provider(struct device_node *from, const char *n; char *tmp; - tmp = kstrdup(name, GFP_KERNEL); + tmp = kstrdup_and_replace(name, '-', '_', GFP_KERNEL); if (!tmp) return NULL; - strreplace(tmp, '-', '_'); /* Node named "clock" with "clock-output-names" */ for_each_of_allnodes_from(from, np) { diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 8c40f10280b7..607e34d8e289 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "clock.h" @@ -473,11 +474,11 @@ static const char * __init clkctrl_get_name(struct device_node *np) const int prefix_len = 11; const char *compat; const char *output; + const char *end; char *name; if (!of_property_read_string_index(np, "clock-output-names", 0, &output)) { - const char *end; int len; len = strlen(output); @@ -491,13 +492,13 @@ static const char * __init clkctrl_get_name(struct device_node *np) of_property_for_each_string(np, "compatible", prop, compat) { if (!strncmp("ti,clkctrl-", compat, prefix_len)) { + end = compat + prefix_len; /* Two letter minimum name length for l3, l4 etc */ - if (strnlen(compat + prefix_len, 16) < 2) + if (strnlen(end, 16) < 2) continue; - name = kasprintf(GFP_KERNEL, "%s", compat + prefix_len); + name = kstrdup_and_replace(end, '-', '_', GFP_KERNEL); if (!name) continue; - strreplace(name, '-', '_'); return name; }