From nobody Fri Dec 19 16:00:47 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DC24C83F14 for ; Tue, 29 Aug 2023 10:56:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235216AbjH2Kzg (ORCPT ); Tue, 29 Aug 2023 06:55:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235330AbjH2KzT (ORCPT ); Tue, 29 Aug 2023 06:55:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24E0ECF4 for ; Tue, 29 Aug 2023 03:54:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DFA096546F for ; Tue, 29 Aug 2023 10:54:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A528C433CA; Tue, 29 Aug 2023 10:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693306485; bh=KSe7NuuTmvNFUfkVlgyIp0m+TWXLJzpYZqE/n8ra5Ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FTPGxZCuLLZc4QW8EWFJFFrdXXOk/U9oGCOR1rpE3WRlVOfOzEifOgkFsWv4EeGYt hSoz/kU4u/35xdFnqiB0BpgZkjKY5Z1guaquCeN2iReO7Qu+FRBtflMtLYC1AQOlHp GH/b0kMQ33KhTgZ1SzDxdrOkKlcYHVw7whbFkPl2BzqGOeetv0pYGQ3+jof+6/IQuA wvbZSg3Di65UmAWOJHw6RnnTjtqcW+kS5fBBKtXQ8HQRfy0fUnpvKFQLXz7nkg+O0r iwu2xgsG5Lbac7cX5de82QoNr//2h1tU2XfDGYkU3Y+JIhf/5aPWZ1gJcUeGwpXw1X Ut+mu5MorOOxQ== From: Jisheng Zhang To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Vladimir Zapolskiy , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Emil Renner Berthing , Samin Guo , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Thierry Reding , Jonathan Hunter , Nobuhiro Iwamatsu , Russell King , Matthias Brugger , AngeloGioacchino Del Regno , Bartosz Golaszewski Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 20/22] net: stmmac: dwmac-tegra: use devm_stmmac_probe_config_dt() Date: Tue, 29 Aug 2023 18:40:31 +0800 Message-Id: <20230829104033.955-21-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230829104033.955-1-jszhang@kernel.org> References: <20230829104033.955-1-jszhang@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Simplify the driver's probe() function by using the devres variant of stmmac_probe_config_dt(). The calling of stmmac_pltfr_remove() now needs to be switched to stmmac_pltfr_remove_no_dt(). Signed-off-by: Jisheng Zhang --- drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/ne= t/ethernet/stmicro/stmmac/dwmac-tegra.c index e0f3cbd36852..7e512c0762ea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c @@ -284,7 +284,7 @@ static int tegra_mgbe_probe(struct platform_device *pde= v) if (err < 0) goto disable_clks; =20 - plat =3D stmmac_probe_config_dt(pdev, res.mac); + plat =3D devm_stmmac_probe_config_dt(pdev, res.mac); if (IS_ERR(plat)) { err =3D PTR_ERR(plat); goto disable_clks; @@ -303,7 +303,7 @@ static int tegra_mgbe_probe(struct platform_device *pde= v) GFP_KERNEL); if (!plat->mdio_bus_data) { err =3D -ENOMEM; - goto remove; + goto disable_clks; } } =20 @@ -321,7 +321,7 @@ static int tegra_mgbe_probe(struct platform_device *pde= v) 500, 500 * 2000); if (err < 0) { dev_err(mgbe->dev, "timeout waiting for TX lane to become enabled\n"); - goto remove; + goto disable_clks; } =20 plat->serdes_powerup =3D mgbe_uphy_lane_bringup_serdes_up; @@ -342,12 +342,10 @@ static int tegra_mgbe_probe(struct platform_device *p= dev) =20 err =3D stmmac_dvr_probe(&pdev->dev, plat, &res); if (err < 0) - goto remove; + goto disable_clks; =20 return 0; =20 -remove: - stmmac_remove_config_dt(pdev, plat); disable_clks: clk_bulk_disable_unprepare(ARRAY_SIZE(mgbe_clks), mgbe->clks); =20 @@ -360,7 +358,7 @@ static void tegra_mgbe_remove(struct platform_device *p= dev) =20 clk_bulk_disable_unprepare(ARRAY_SIZE(mgbe_clks), mgbe->clks); =20 - stmmac_pltfr_remove(pdev); + stmmac_pltfr_remove_no_dt(pdev); } =20 static const struct of_device_id tegra_mgbe_match[] =3D { --=20 2.40.1