From patchwork Thu Dec 28 22:21:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10135955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 07F3060388 for ; Thu, 28 Dec 2017 22:22:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EED4A2D50B for ; Thu, 28 Dec 2017 22:22:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3B762D52C; Thu, 28 Dec 2017 22:22:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 945392D50B for ; Thu, 28 Dec 2017 22:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=vPCc/HesJ9Cblt+br+JMrzzDW/rg04aQpRxirYAvrKI=; b=Owht+MWTF2qD97+XUIG5DCJQxP TnjYIFEAYiNO1sqQpKmQmJMlVPigN2OKe6oJX5fiBajoNOfJl0ZkrkQmDKE2QnPDYLjR9eNH7zzy6 HqjaAtL9A1WS2gi5EoZvcGEhNcEPfFFx6RcwsIjTbJI0rygvv72N95uARh3cf32OEEfFsiBLmVICD xR+vk+6Q29EornJGx7aKI/3gCEZah8MITbHuBVbccW7gi38H5Fw2uIeIFqfk8y6Sn/n7wPn6swI3h P+T2cFJgjLqTPFiJe+Hae+fGr0YI/9te65ABnxqn8SEeQ78yvqq6Bgmw3TJM79j8iartzhQgLTgfj t7qLdDzg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eUgYz-0004XI-Fe; Thu, 28 Dec 2017 22:22:09 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eUgYo-0004RK-7E for linux-amlogic@lists.infradead.org; Thu, 28 Dec 2017 22:22:00 +0000 Received: by mail-wm0-x241.google.com with SMTP id 9so45894712wme.4 for ; Thu, 28 Dec 2017 14:21:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G0ERHNFqFbOaLWlQa1ixHwE6wn5v1l+3d/LNUvARlkw=; b=uWpp55Qu1kNovKi1PSrSH7HZ6p9LAeau7I1Vv5uqR1HKQOSFYPfqwJ//FMgqF/9x+/ rOA+M2ow0THf83BejLFn+HP+Ty/ifgHK2LBa+apCiW6cmYEar3Qt90M5xJUkK8Jsot+p 3N1BqS0Ov5z/Zo0i7zjNUo9NwGFSaLszyqw5Q9+J+FAuR8zz4lryXhS4gv94JIvMZdkJ I0gcm1unIeIsSX0UOGZIDF5poWpZh7IzXjuaRTZETAQU1+7irodqyMF4IX42axL9hQ1k WBlqZaKCpHJZPk2h+j5X+UiJEZsdzv38+7cTcR3sZaL89iXVYwGtUguqf/k0GECQusxW e+yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G0ERHNFqFbOaLWlQa1ixHwE6wn5v1l+3d/LNUvARlkw=; b=RPX3JFLO2o3j40W4+FNIYAE6VaKVkdWZNYsib2i9QDNUABIPQ8IxtodFSyq5v3xYXx S2u3NATNZYArKD/NhZcRWN3ADTxAXd+P7ctP6fgkBLLNFAkYs+KfUI6pOA1B7oP2pCAV A9eeMpnyoTb/3uyVrjad+XQgQXjlyl7WX4LVXaoD+5LxTD7MfcPWVxXTlu44ocC2kqew +IjplBt8x44ogP20q35aGcsoKBvUFh3I6sLH0Qk2MLy4j6IFjBWeIR+ZFUDgieDdYvQh XRl5O+LgSN+1k4fxZ8xTyRffaM7I/l3rNhya3jN0kxF9/rfWIqzUSYgmAGbApRvV8JQm gnFg== X-Gm-Message-State: AKGB3mIsMr5/U6OAef/vlE+9tijUwLNaYeo7tYTCYqKaof2Txaf6ubJr LYyFnbfpSoBHkqWknWCjxfo= X-Google-Smtp-Source: ACJfBovdXdcrzzM7AfDfjgJBCykRDSr3C1Wiqwo8B37vijbI0AdGOaxhNAApugO7IUIaJtWUUIKP/Q== X-Received: by 10.28.6.21 with SMTP id 21mr24702859wmg.73.1514499706436; Thu, 28 Dec 2017 14:21:46 -0800 (PST) Received: from blackbox.darklights.net (p5DD9B1AC.dip0.t-ipconnect.de. [93.217.177.172]) by smtp.googlemail.com with ESMTPSA id o16sm25843679wmi.29.2017.12.28.14.21.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Dec 2017 14:21:45 -0800 (PST) From: Martin Blumenstingl To: netdev@vger.kernel.org, ingrassia@epigenesys.com Subject: [RFT net-next v3 2/5] net: stmmac: dwmac-meson8b: simplify generating the clock names Date: Thu, 28 Dec 2017 23:21:25 +0100 Message-Id: <20171228222128.15215-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171228222128.15215-1-martin.blumenstingl@googlemail.com> References: <20171228222128.15215-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171228_142158_356404_A9374DCC X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linus.luessing@c0d3.blue, narmstrong@baylibre.com, Martin Blumenstingl , khilman@baylibre.com, alexandre.torgue@st.com, linux-amlogic@lists.infradead.org, peppe.cavallaro@st.com, jbrunet@baylibre.com MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of using a custom buffer, snprintf() and devm_kstrdup() we can simplify this by using devm_kasprintf(). No functional changes - this just makes the code shorter. Signed-off-by: Martin Blumenstingl --- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index e1d5907e481c..1c14210df465 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -86,7 +86,6 @@ static int meson8b_init_rgmii_clk(struct meson8b_dwmac *dwmac) struct clk_init_data init; int i, ret; struct device *dev = &dwmac->pdev->dev; - char clk_name[32]; const char *clk_div_parents[1]; const char *mux_parent_names[MUX_CLK_NUM_PARENTS]; static const struct clk_div_table clk_25m_div_table[] = { @@ -113,8 +112,8 @@ static int meson8b_init_rgmii_clk(struct meson8b_dwmac *dwmac) } /* create the m250_mux */ - snprintf(clk_name, sizeof(clk_name), "%s#m250_sel", dev_name(dev)); - init.name = clk_name; + init.name = devm_kasprintf(dev, GFP_KERNEL, "%s#m250_sel", + dev_name(dev)); init.ops = &clk_mux_ops; init.flags = 0; init.parent_names = mux_parent_names; @@ -132,8 +131,8 @@ static int meson8b_init_rgmii_clk(struct meson8b_dwmac *dwmac) return PTR_ERR(dwmac->m250_mux_clk); /* create the m250_div */ - snprintf(clk_name, sizeof(clk_name), "%s#m250_div", dev_name(dev)); - init.name = devm_kstrdup(dev, clk_name, GFP_KERNEL); + init.name = devm_kasprintf(dev, GFP_KERNEL, "%s#m250_div", + dev_name(dev)); init.ops = &clk_divider_ops; init.flags = CLK_SET_RATE_PARENT; clk_div_parents[0] = __clk_get_name(dwmac->m250_mux_clk); @@ -151,8 +150,8 @@ static int meson8b_init_rgmii_clk(struct meson8b_dwmac *dwmac) return PTR_ERR(dwmac->m250_div_clk); /* create the m25_div */ - snprintf(clk_name, sizeof(clk_name), "%s#m25_div", dev_name(dev)); - init.name = devm_kstrdup(dev, clk_name, GFP_KERNEL); + init.name = devm_kasprintf(dev, GFP_KERNEL, "%s#m25_div", + dev_name(dev)); init.ops = &clk_divider_ops; init.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT; clk_div_parents[0] = __clk_get_name(dwmac->m250_div_clk);