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 E42F2C83F17 for ; Tue, 29 Aug 2023 10:55:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235198AbjH2Ky3 (ORCPT ); Tue, 29 Aug 2023 06:54:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235216AbjH2KyI (ORCPT ); Tue, 29 Aug 2023 06:54:08 -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 70AB8E41 for ; Tue, 29 Aug 2023 03:53:37 -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 C50B765477 for ; Tue, 29 Aug 2023 10:53:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C13A9C433CB; Tue, 29 Aug 2023 10:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693306416; bh=dqxGACbIzG+c4wvKf/T/eZtPgkfhpdBlD0whApGU3fA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gNCFceCcznbfb4il/U834RiGeYZKk2vbe6kR5Xqd4SgR/E7h8rX4UDuTHLnhJkMbV X0njrltOaPqTQZdHViHSH72DNqNT9BntBPW7AjB8A621QXBwYAJ7TtMIkK+zl9iXU6 kvEHs+jztEVkpIEABK1jF+X3rk8fH7U6oFZgUOm+nMzipAyvwuOZO5DHF9xv81sfpL HbwFW2DhxlKLSBhfu/slhrvf6OyCQHEA3p0+pQ00DNunfGIgTsaX1mW2PHDUIzCDQ0 u4roCp8p99xNsW1ZKseSNJzfiQWhsRvE7JLp2rA6LhJWQe5PyjcP9r0TgZwScEPwM+ dGYVceD6lQJoA== 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 10/22] net: stmmac: dwmac-mediatek: use devm_stmmac_probe_config_dt() Date: Tue, 29 Aug 2023 18:40:21 +0800 Message-Id: <20230829104033.955-11-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-mediatek.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-mediatek.c index 7580077383c0..1c37df6d22b3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c @@ -656,7 +656,7 @@ static int mediatek_dwmac_probe(struct platform_device = *pdev) if (ret) return ret; =20 - plat_dat =3D stmmac_probe_config_dt(pdev, stmmac_res.mac); + plat_dat =3D devm_stmmac_probe_config_dt(pdev, stmmac_res.mac); if (IS_ERR(plat_dat)) return PTR_ERR(plat_dat); =20 @@ -665,7 +665,7 @@ static int mediatek_dwmac_probe(struct platform_device = *pdev) =20 ret =3D mediatek_dwmac_clks_config(priv_plat, true); if (ret) - goto err_remove_config_dt; + return ret; =20 ret =3D stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) @@ -675,8 +675,6 @@ static int mediatek_dwmac_probe(struct platform_device = *pdev) =20 err_drv_probe: mediatek_dwmac_clks_config(priv_plat, false); -err_remove_config_dt: - stmmac_remove_config_dt(pdev, plat_dat); =20 return ret; } @@ -685,7 +683,7 @@ static void mediatek_dwmac_remove(struct platform_devic= e *pdev) { struct mediatek_dwmac_plat_data *priv_plat =3D get_stmmac_bsp_priv(&pdev-= >dev); =20 - stmmac_pltfr_remove(pdev); + stmmac_pltfr_remove_no_dt(pdev); mediatek_dwmac_clks_config(priv_plat, false); } =20 --=20 2.40.1