From patchwork Mon Jun 12 12:40:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2575741vqr; Mon, 12 Jun 2023 06:09:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7M2qbwjBOE8zz0iCJC5xp5bdtOf+tbp52cbemeuJp9M9DlHxN68kePY1baF93RekUlOLFb X-Received: by 2002:a05:6a00:99b:b0:658:c1a9:becc with SMTP id u27-20020a056a00099b00b00658c1a9beccmr12266462pfg.12.1686575390931; Mon, 12 Jun 2023 06:09:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686575390; cv=none; d=google.com; s=arc-20160816; b=a87SblhW0N0h120DP44IuY3nkVXVygu7icNGswVghI6vOTTqHlTztRKqCo7Rk0TXPV U701aINa1FA9bzVjk2TIXgw4s9iAOs0GI+4E/+4f6ts4rox0uG1PZwLboKtX5yyc989U FfcGTp9fnfYsilQvBlg4sgJsbuyPZxItU0LyWabYwtHmvnKjDc4/+72aAWjFMEZiYmOP 2HG+00PeGQruv9OutXSXiJZP+0ijDFI7BttBQBvOexC24Z5YAQ9OS15QwrbNO6Mym5pW NE6AWkux5HOeOWgNGfQdnddAZ1PJq3M0CzcMOB0XrWO8hcylq3/Qm0XTRy4ynu6Tdwuk RHBw== 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=o+xp6UidI5XIGEW5S79LM3z13HDDjlsFuXTXET0D8zQ=; b=v5i8SgRsveNPHUaI/+UDB0emls6ZjV4iN/r/UQkBaNaVL+B4AIJ2gYYYvGEDCq2spQ mYkui1YumHGauhLVXM8xooBraAkDYcd0efnOAM48VqQeyQedzTxn2T+xYKQdU93808ss vE+SsMU+9HtWYqdT2gw2yLXDKYpuI3XyMs5hD2hMmFBHY0sXeWFWyDbuB9Nr/TqEm+s+ lOQS6s6cEElJX0ZdxFeEPgsgD0Ao0ET46TtQvoko5Zw0bCMlBU51UYfmRIhAlkm9NQ9P LxOr86GLv377vFhK5cbSMKP93PEI5fm8OE4HawF9FnjeIOKrAwf/twJn/EqynNbSZtoQ oqyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="I/XYks2C"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a6566d4000000b005138de75d17si6791308pgw.116.2023.06.12.06.09.37; Mon, 12 Jun 2023 06:09:50 -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=@kernel.org header.s=k20201202 header.b="I/XYks2C"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229800AbjFLMle (ORCPT + 99 others); Mon, 12 Jun 2023 08:41:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234922AbjFLMl0 (ORCPT ); Mon, 12 Jun 2023 08:41:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5FE1E7D; Mon, 12 Jun 2023 05:41:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 66EEB615BE; Mon, 12 Jun 2023 12:41:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36612C433EF; Mon, 12 Jun 2023 12:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686573683; bh=LjpXrEeTcB1Fm83RKr+CRzUCyhnCEVz+Bc2E3LKJa00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I/XYks2C6ryLHmOejgKsFrzAqwS+KkEb4b/bj8IluEgvzIdCmvmUZ0KfzV6JtOvPM TE94fMeZtPCL7aBaJcSSgxNcjGyUttsE5YiTb3D4BCBKxbqmRhkMvyFabGPSjz94eg kgr4ccoTNyszdxSB7U5/WnI71j8I0J9gTOudkl4EIZCcYAyP/UJJWKbddULaXPH9SV Gq9CpdC3xXyMzOq4HQn1yk4hgjI4XVYLK9pcDkh8/dhCkTE9zL2rQoWp0rb888XLo3 mgVFjY0r9HbfDN8X51PbdKMinlW0MWeriOaBTcyDtlTKPbUIgvHcoFAH5+E0aYtdUd J0EoJo+XOAOMQ== From: Arnd Bergmann To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Grygorii Strashko , linux-omap@vger.kernel.org, Vignesh Raghavendra , Nishanth Menon , Tero Kristo , Arnd Bergmann , Randy Dunlap , Mao Wenan , Andrew Lunn , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexei Starovoitov , Ilias Apalodimas Subject: [PATCH 2/3] net: ethernet: ti-cpsw:: rename soft_reset() function Date: Mon, 12 Jun 2023 14:40:05 +0200 Message-Id: <20230612124024.520720-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612124024.520720-1-arnd@kernel.org> References: <20230612124024.520720-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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?1768502477198218414?= X-GMAIL-MSGID: =?utf-8?q?1768502477198218414?= From: Arnd Bergmann While looking at the glob symbols shared between the cpsw drivers, I noticed that soft_reset() is the only one that is missing a proper namespace prefix, and will pollute the kernel namespace, so rename it to be consistent with the other symbols. Fixes: c5013ac1dd0e1 ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/ethernet/ti/cpsw_new.c | 2 +- drivers/net/ethernet/ti/cpsw_priv.c | 2 +- drivers/net/ethernet/ti/cpsw_priv.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index f9cd566d1c9b5..a61edee2289f1 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -679,7 +679,7 @@ static void cpsw_init_host_port(struct cpsw_priv *priv) struct cpsw_common *cpsw = priv->cpsw; /* soft reset the controller and initialize ale */ - soft_reset("cpsw", &cpsw->regs->soft_reset); + cpsw_soft_reset("cpsw", &cpsw->regs->soft_reset); cpsw_ale_start(cpsw->ale); /* switch to vlan unaware mode */ diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index c61e4e44a78f0..4e7fec1ce8d9c 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -551,7 +551,7 @@ static void cpsw_init_host_port(struct cpsw_priv *priv) u32 control_reg; /* soft reset the controller and initialize ale */ - soft_reset("cpsw", &cpsw->regs->soft_reset); + cpsw_soft_reset("cpsw", &cpsw->regs->soft_reset); cpsw_ale_start(cpsw->ale); /* switch to vlan unaware mode */ diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c index e966dd47e2db3..4ebe8bc325730 100644 --- a/drivers/net/ethernet/ti/cpsw_priv.c +++ b/drivers/net/ethernet/ti/cpsw_priv.c @@ -275,7 +275,7 @@ void cpsw_set_slave_mac(struct cpsw_slave *slave, struct cpsw_priv *priv) slave_write(slave, mac_lo(priv->mac_addr), SA_LO); } -void soft_reset(const char *module, void __iomem *reg) +void cpsw_soft_reset(const char *module, void __iomem *reg) { unsigned long timeout = jiffies + HZ; diff --git a/drivers/net/ethernet/ti/cpsw_priv.h b/drivers/net/ethernet/ti/cpsw_priv.h index 34230145ca0b5..efc5c69e93028 100644 --- a/drivers/net/ethernet/ti/cpsw_priv.h +++ b/drivers/net/ethernet/ti/cpsw_priv.h @@ -456,7 +456,7 @@ int cpsw_tx_poll(struct napi_struct *napi_tx, int budget); int cpsw_rx_mq_poll(struct napi_struct *napi_rx, int budget); int cpsw_rx_poll(struct napi_struct *napi_rx, int budget); void cpsw_rx_vlan_encap(struct sk_buff *skb); -void soft_reset(const char *module, void __iomem *reg); +void cpsw_soft_reset(const char *module, void __iomem *reg); void cpsw_set_slave_mac(struct cpsw_slave *slave, struct cpsw_priv *priv); void cpsw_ndo_tx_timeout(struct net_device *ndev, unsigned int txqueue); int cpsw_need_resplit(struct cpsw_common *cpsw);