From mboxrd@z Thu Jan 1 00:00:00 1970 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 7A7D0CD37B4 for ; Sun, 17 Sep 2023 14:44:08 +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:References:In-Reply-To: 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: List-Owner; bh=bTBCPHZZl9eYhJkG1sf5Bo7d1c5n0JQGbyJJrjDwDZU=; b=Nw+rOWtuY/0zkw CPZhZydllzJSwTOZLajBmLG3+GN/UVm3aDO3Gj4h8B1i3CYQDT5Jv9ZYDTI8qNGoGSyXSBdmbqwN4 Lx0ShCpS2x0xksOFZUYJtkLcP8sPByDX8U5S4IF8FX9fG43wVa0MWleLESlaqxt3E16LALPZKMsxS t3nyuMhRZhbh+46SAJSWsUDKgUC/R7PqlnmYQsSQrTRLkFiB9oZKEdpfJqpD4rOWbeaB3190aYkRg tZahAgMzVdXfChq0UHTduUDBz4/Ws4+eoQ7HzZy8EmV1QiTj4VT0Oq53f5tUerdvJqn6kPTo5/rPb zRBA1yPidd7HkqkciJpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qhszt-00DjR3-2K; Sun, 17 Sep 2023 14:43:41 +0000 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qhszr-00DjQV-14; Sun, 17 Sep 2023 14:43:40 +0000 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b703a0453fso61705911fa.3; Sun, 17 Sep 2023 07:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694961817; x=1695566617; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fdaEbu6km8BqHRGwr2c7GCk1sImwIY5D3Zm1fNqAyQY=; b=lRP3bEMXHdgtsBmQ+TYQLGpyhX1P3kgxWFXggFwGUVK36rgcHg22YnJL0dvPLm9dBV HYsEupznb96DA05TgwLzZtm/G5vX10mwokIru9t80HyD5n2PMG2h9sInNBZxM3VopiI7 3eHopfG87apiliMLMftYXa//IOx3atl15aScMsvgeUJAdWX5KlVfdWYye8kV973WbvFD jqy6FDJs+VcGxmyRtHlW0W4K5ZcH2p+498quincpT/0o3rkePW7orsEMum07VzWQLVVl c80ZQ8rSVgWy6mE4U8NYKdWf1EPdpwiQsdLByLM5U6FPpc37inIBKCCNSlpwPD/YrjG5 FNPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694961817; x=1695566617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fdaEbu6km8BqHRGwr2c7GCk1sImwIY5D3Zm1fNqAyQY=; b=HfcX1JYSm58GSl5J7xm2Ejqz5CmJgXHBTkzFW0iY/UockT5fBS7mwPaCA/YJiVAgNw fIgKtLeZ0w1h0Zzk2aPYpHaI/qHPPpmBudNZnawkzxvESj5U8BWEO+4iy7XGzI5stgRb CKbQwX5r6jO+JuRvPwFZKczBzirHvzMZoe4hwH3Ap7bWVvi9UH1dszt01l7NbklEzbVH HcDkniRgpILefFPsao5rnxZGVYxVc/x33wD89QEO0x6tW2+SuEWZwjgML2EOFhq6vPvn 402AV79/bN3wWMtmZMMAfHjpjMv5gIVe7lVe1L0PuGnCB6m5c0V0g4iQi5nWeJVYGYdI /wzg== X-Gm-Message-State: AOJu0YzWl7w1dQ4eMDAa8A42dELN747kPsSqsOWguIRnO7Uiby+wlxEe brdDjrHGg4Men7cshxMqvec= X-Google-Smtp-Source: AGHT+IEJIeAd3ewMw2+cvZVpanMlw/F0SbFIvtkFqTZ0ddrwDnzgxXx7HQKIxO9egvEEZV79PvH9eA== X-Received: by 2002:a2e:9409:0:b0:2bd:1bca:ebee with SMTP id i9-20020a2e9409000000b002bd1bcaebeemr5200667ljh.19.1694961816913; Sun, 17 Sep 2023 07:43:36 -0700 (PDT) Received: from jernej-laptop.localnet (APN-123-246-155-gprs.simobil.net. [46.123.246.155]) by smtp.gmail.com with ESMTPSA id x8-20020a1709065ac800b0099bccb03eadsm4998862ejs.205.2023.09.17.07.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 07:43:36 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= 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 , Samuel Holland , Thierry Reding , Nobuhiro Iwamatsu , Russell King , Matthias Brugger , AngeloGioacchino Del Regno , Jisheng Zhang Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH net-next v2 19/23] net: stmmac: dwmac-sunxi: use devm_stmmac_probe_config_dt() Date: Sun, 17 Sep 2023 16:43:33 +0200 Message-ID: <5714209.DvuYhMxLoT@jernej-laptop> In-Reply-To: <20230916075829.1560-20-jszhang@kernel.org> References: <20230916075829.1560-1-jszhang@kernel.org> <20230916075829.1560-20-jszhang@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230917_074339_373449_0A2EEDE0 X-CRM114-Status: GOOD ( 20.32 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne sobota, 16. september 2023 ob 09:58:25 CEST je Jisheng Zhang napisal(a): > Simplify the driver's probe() function by using the devres > variant of stmmac_probe_config_dt(). > > The remove_new() callback now needs to be switched to > stmmac_pltfr_remove_no_dt(). > > Signed-off-by: Jisheng Zhang Reviewed-by: Jernej Skrabec Best regards, Jernej > --- > .../net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 25 +++++++------------ > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c > b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c index > beceeae579bf..b857235f5b1f 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c > @@ -108,36 +108,31 @@ static int sun7i_gmac_probe(struct platform_device > *pdev) if (ret) > return ret; > > - plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); > + plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac); > if (IS_ERR(plat_dat)) > return PTR_ERR(plat_dat); > > gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); > - if (!gmac) { > - ret = -ENOMEM; > - goto err_remove_config_dt; > - } > + if (!gmac) > + return -ENOMEM; > > ret = of_get_phy_mode(dev->of_node, &gmac->interface); > if (ret && ret != -ENODEV) { > dev_err(dev, "Can't get phy-mode\n"); > - goto err_remove_config_dt; > + return ret; > } > > gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx"); > if (IS_ERR(gmac->tx_clk)) { > dev_err(dev, "could not get tx clock\n"); > - ret = PTR_ERR(gmac->tx_clk); > - goto err_remove_config_dt; > + return PTR_ERR(gmac->tx_clk); > } > > /* Optional regulator for PHY */ > gmac->regulator = devm_regulator_get_optional(dev, "phy"); > if (IS_ERR(gmac->regulator)) { > - if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) { > - ret = -EPROBE_DEFER; > - goto err_remove_config_dt; > - } > + if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > dev_info(dev, "no regulator found\n"); > gmac->regulator = NULL; > } > @@ -155,7 +150,7 @@ static int sun7i_gmac_probe(struct platform_device > *pdev) > > ret = sun7i_gmac_init(pdev, plat_dat->bsp_priv); > if (ret) > - goto err_remove_config_dt; > + return ret; > > ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); > if (ret) > @@ -165,8 +160,6 @@ static int sun7i_gmac_probe(struct platform_device > *pdev) > > err_gmac_exit: > sun7i_gmac_exit(pdev, plat_dat->bsp_priv); > -err_remove_config_dt: > - stmmac_remove_config_dt(pdev, plat_dat); > > return ret; > } > @@ -179,7 +172,7 @@ MODULE_DEVICE_TABLE(of, sun7i_dwmac_match); > > static struct platform_driver sun7i_dwmac_driver = { > .probe = sun7i_gmac_probe, > - .remove_new = stmmac_pltfr_remove, > + .remove_new = stmmac_pltfr_remove_no_dt, > .driver = { > .name = "sun7i-dwmac", > .pm = &stmmac_pltfr_pm_ops, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel