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 4B855C83F16 for ; Tue, 29 Aug 2023 10:56:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235274AbjH2Kzk (ORCPT ); Tue, 29 Aug 2023 06:55:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235348AbjH2KzW (ORCPT ); Tue, 29 Aug 2023 06:55:22 -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 1D337E4A for ; Tue, 29 Aug 2023 03:54:54 -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 70908654B4 for ; Tue, 29 Aug 2023 10:54:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC32AC433C8; Tue, 29 Aug 2023 10:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693306492; bh=xaX/1pgdUp6jF0eAGOIu3QPf4VByZDmH71/iKbXHLBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ilhXRwxhYHCwcTM0jfOnU1+PAELTaALR5BuUY5pkvJ41r8pdlesyGZZf8+8ntDxF0 S8Q9NUnqQyJvAE4afUKQrCRbe+E2xtKbpPgnTRbbiJrsq92illV9gNdd4z05zUBKQK P3HJHlvNUw7trN6hsLTXDzRkNaEuJ/hjWK2xQSuKhQv0xiDk5jfWkTLU7cPgo2NNwd mMjnyLPFyNBCkN97M5l8v619Csd77VWjb8UYiORhIdson+Ikj8+Gbo8QhJgDdXoMbC 824HRqoFSSIc8Uo7miNP9ZCxiRu923uCjqSdU4H5LropysJyVR+ddB48nxzGjNy4N6 lhfRBoYBgx6Jw== 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 21/22] net: stmmac: dwmac-visconti: use devm_stmmac_probe_config_dt() Date: Tue, 29 Aug 2023 18:40:32 +0800 Message-Id: <20230829104033.955-22-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 --- .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-visconti.c index 22d113fb8e09..75fafd23385a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c @@ -220,15 +220,13 @@ static int visconti_eth_dwmac_probe(struct platform_d= evice *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 dwmac =3D devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL); - if (!dwmac) { - ret =3D -ENOMEM; - goto remove_config; - } + if (!dwmac) + return -ENOMEM; =20 spin_lock_init(&dwmac->lock); dwmac->reg =3D stmmac_res.addr; @@ -238,7 +236,7 @@ static int visconti_eth_dwmac_probe(struct platform_dev= ice *pdev) =20 ret =3D visconti_eth_clock_probe(pdev, plat_dat); if (ret) - goto remove_config; + return ret; =20 visconti_eth_init_hw(pdev, plat_dat); =20 @@ -252,8 +250,6 @@ static int visconti_eth_dwmac_probe(struct platform_dev= ice *pdev) =20 remove: visconti_eth_clock_remove(pdev); -remove_config: - stmmac_remove_config_dt(pdev, plat_dat); =20 return ret; } @@ -263,7 +259,7 @@ static void visconti_eth_dwmac_remove(struct platform_d= evice *pdev) struct net_device *ndev =3D platform_get_drvdata(pdev); struct stmmac_priv *priv =3D netdev_priv(ndev); =20 - stmmac_pltfr_remove(pdev); + stmmac_pltfr_remove_no_dt(pdev); =20 visconti_eth_clock_remove(pdev); =20 --=20 2.40.1