From patchwork Tue Feb 6 15:20:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diogo Ivo X-Patchwork-Id: 13547523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6F181C4828D for ; Tue, 6 Feb 2024 15:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=/EfXQCH9iE/olEa8dgMBS8w982R82jL7Sp8QxX7Zb9Y=; b=Vx56FDHshSKv+4 kT7WZydsI+EUWa6XUbOAlj0+xRogyAMSh7dYA+c3vDnzIWxydgAKFBI29KCV31Qe5g4oGR/0nT1tK 6fY39CJqi34XmML4jg9oNva+XQgAsPHWGEoX+RBXJ3dr/1FRgYE2RZriTMbtcJxzocIlRHbJiGEh0 ArSggQcDwNjMszQkPt5bv+JJswYxggmbX+QOZ9HdFIeO2u/BXK8T9MZPSKNhuNAy1vWDr9//3ynAj UNvO4KapAnz7HmtVPInzYQA7tGsqz50oJQY7fGqs//FnSqkFm7cIMWcQFKMJnyTGR/evvfSb1ZI6A IBAqI5yfnxN+mw9B8OnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXNG4-000000083xO-1DSK; Tue, 06 Feb 2024 15:21:12 +0000 Received: from mta-65-226.siemens.flowmailer.net ([185.136.65.226]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXNFz-000000083r3-1YQE for linux-arm-kernel@lists.infradead.org; Tue, 06 Feb 2024 15:21:10 +0000 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202402061520556f541b5ebf9a95b9eb for ; Tue, 06 Feb 2024 16:20:56 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=diogo.ivo@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=aO9HXYqOshN4TxCHyIoXrsxFdzEISczVko5LuJ38+O4=; b=dn05NAVjXK31qK8Z6fAuMvdEI8pz/ekx1yY5Yrf4V8yEvZ5bWmt9TPmCtJWbAh9RMjd1Si U0zkonrvbnsLE6br30E2AgnaMauqxFkNzIouAJBOtYCARZcOkZEdLQsH1XtCtJ4Y1OuM8iX6 s15SHCz31r29Enh68Gf9NcLzVf2Jk=; From: Diogo Ivo To: danishanwar@ti.com, rogerq@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew@lunn.ch, vigneshr@ti.com, jan.kiszka@siemens.com, dan.carpenter@linaro.org, robh@kernel.org, grygorii.strashko@ti.com, horms@kernel.org Cc: Diogo Ivo , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH net] net: ti: icssg-prueth: Remove duplicate cleanup calls in emac_ndo_stop() Date: Tue, 6 Feb 2024 15:20:51 +0000 Message-ID: <20240206152052.98217-1-diogo.ivo@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1320519:519-21489:flowmailer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240206_072107_933945_E6DEC399 X-CRM114-Status: UNSURE ( 7.41 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove the duplicate calls to prueth_emac_stop() and prueth_cleanup_tx_chns() in emac_ndo_stop(). Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") Fixes: 186734c15886 ("net: ti: icssg-prueth: add packet timestamping and ptp support") Signed-off-by: Diogo Ivo Reviewed-by: Roger Quadros Reviewed-by: MD Danish Anwar --- drivers/net/ethernet/ti/icssg/icssg_prueth.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c index 411898a4f38c..cf7b73f8f450 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c @@ -1489,9 +1489,6 @@ static int emac_ndo_stop(struct net_device *ndev) /* Destroying the queued work in ndo_stop() */ cancel_delayed_work_sync(&emac->stats_work); - /* stop PRUs */ - prueth_emac_stop(emac); - if (prueth->emacs_initialized == 1) icss_iep_exit(emac->iep); @@ -1502,7 +1499,6 @@ static int emac_ndo_stop(struct net_device *ndev) free_irq(emac->rx_chns.irq[rx_flow], emac); prueth_ndev_del_tx_napi(emac, emac->tx_ch_num); - prueth_cleanup_tx_chns(emac); prueth_cleanup_rx_chns(emac, &emac->rx_chns, max_rx_flows); prueth_cleanup_tx_chns(emac);