From patchwork Mon Jan 6 12:25:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13927384 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 98B4FE77198 for ; Mon, 6 Jan 2025 12:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:Content-Type :Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YRoEPXMnuvWAlKLiIj/33TvZCcNaaMUqV2ZCf8NplQI=; b=qv5kTvr4f6s/tPmt+AqpKAF7NU dulJMNqFS6hlm4M45vnv/KaY9S3wrtN7ojupcKdHhbNIOh5+9X/V5GgSFrdl1ee9OuhTFzqb/DB2D 05oBrXzO9P5lUYZilWun8cbFXgNbFH9XB45ndgGXA9PS8C/L2KesMxKDjLhLQgEWTfhOgZTAeRCyi 2xImc9Mtedg25Pxl7IZ5paGQSuWpsaVl11PDfaxX7/el+EDTRXzyO5YEh9NhtPc0fC4NzBbeBNbPm td5H9yK7f6fJEXJD5sJpN1TAfZQH1SA+ap2Taxp2dfGY9O7x5GGRhUyQKFCBwNQQlG3vfoJs/Es7w Oaynz/Uw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tUmUe-00000001Gtv-2MZ0; Mon, 06 Jan 2025 12:46:04 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tUmBG-00000001DKF-2JzE for linux-arm-kernel@lists.infradead.org; Mon, 06 Jan 2025 12:26:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=YRoEPXMnuvWAlKLiIj/33TvZCcNaaMUqV2ZCf8NplQI=; b=ET5LMLXh2i7t3Hquxxv9WUCwg5 CoqjNHrafHutcPwgU0wCcTQO3LNbN5J+iWrK7MJEPdvlZwi3utCGD6AiClBwLvkrsom1SS3HqZ8pp O7CZwL4wXZz4H2GvX/TvvsRa/OttjnzpFmFpNwY9hko8XHCC1hS9ThuDrNUJN8/5BOtLFvDtLenb2 xXkSZp32EUSrc5lYHP1ZF0fgiuxPCBgJPmxc45zboXO3c5qurOeYAIExkdrp3IHJhZ36fugbYqRLc QxOmBXkwCppIuLPN3eAfG4Fe7c4QJGmVusu7RGTOBjgpqAsIocrJh7uH5BpkGzNoLP/quN2EIwsPk zvmiesaw==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:51898 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tUmBC-0005tv-1N; Mon, 06 Jan 2025 12:25:58 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1tUmB9-007VXz-8c; Mon, 06 Jan 2025 12:25:55 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jose Abreu , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni Subject: [PATCH net-next v2 14/17] net: stmmac: move setup of eee_ctrl_timer to stmmac_dvr_probe() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 06 Jan 2025 12:25:55 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250106_042602_588706_E7FB57A3 X-CRM114-Status: GOOD ( 10.84 ) 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 Move the initialisation of the EEE software timer to the probe function as it is unnecessary to do this each time we enable software LPI. Signed-off-by: Russell King (Oracle) Reviewed-by: Andrew Lunn --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 1aedb49944ec..aac45c16d7b5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -495,7 +495,6 @@ static void stmmac_eee_init(struct stmmac_priv *priv, bool active) } if (priv->eee_active && !priv->eee_enabled) { - timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0); stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS, STMMAC_DEFAULT_TWT_LS); if (priv->hw->xpcs) @@ -7399,6 +7398,8 @@ int stmmac_dvr_probe(struct device *device, INIT_WORK(&priv->service_task, stmmac_service_task); + timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0); + /* Override with kernel parameters if supplied XXX CRS XXX * this needs to have multiple instances */