From nobody Tue Feb 10 10:54:07 2026 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 45A63C77B61 for ; Fri, 7 Apr 2023 16:12:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240510AbjDGQMK (ORCPT ); Fri, 7 Apr 2023 12:12:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232606AbjDGQLz (ORCPT ); Fri, 7 Apr 2023 12:11:55 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1672CAD0A; Fri, 7 Apr 2023 09:11:35 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-211-012.ewe-ip-backbone.de [91.248.211.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id 432FD66031D9; Fri, 7 Apr 2023 17:11:33 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680883893; bh=0hO8WMKld8+Bk/XP3d7qcuD+4ys6ezwwQR+iMFTGTWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GAqb4m1JVvrycwqpwRSDjPRZLedFQPXqfCxHWzfOMuGz7ZI8/eop7eGi6KVR5zVsT mhu7E1TqHmSrNd3ntMpigxg7mPpHT22S8PudeKNhaMbSziajKj7E8tUfWFtgBzETyV iv+6ZQxWKX4CaYph5XMygeKnCgmu1lrV5AqoeKMX8Luo9MAx0O725jvAOTKLXly+PN RIcJGTFEnApvLRuexm6aBZwbganHHtVarionAq+xDmr5bVt0FHUiRgTit8qvGGyurQ YG8se2BKV41H9mkpfUMfkr6xoLeDP9SPKDdQvBRHAjQleDQTW5rjbKfSmeDIVJC0Fr ct7d3dYkHcD5g== Received: by jupiter.universe (Postfix, from userid 1000) id 017E84807E3; Fri, 7 Apr 2023 18:11:30 +0200 (CEST) From: Sebastian Reichel To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCHv3 2/2] net: ethernet: stmmac: dwmac-rk: fix optional phy regulator handling Date: Fri, 7 Apr 2023 18:11:29 +0200 Message-Id: <20230407161129.70601-3-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230407161129.70601-1-sebastian.reichel@collabora.com> References: <20230407161129.70601-1-sebastian.reichel@collabora.com> 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" The usual devm_regulator_get() call already handles "optional" regulators by returning a valid dummy and printing a warning that the dummy regulator should be described properly. This code open coded the same behaviour, but masked any errors that are not -EPROBE_DEFER and is quite noisy. This change effectively unmasks and propagates regulators errors not involving -ENODEV, downgrades the error print to warning level if no regulator is specified and captures the probe defer message for /sys/kernel/debug/devices_deferred. Fixes: 2e12f536635f ("net: stmmac: dwmac-rk: Use standard devicetree proper= ty for phy regulator") Signed-off-by: Sebastian Reichel --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/e= thernet/stmicro/stmmac/dwmac-rk.c index 7ac9ca9b4935..4ea31ccf24d0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1586,9 +1586,6 @@ static int phy_power_on(struct rk_priv_data *bsp_priv= , bool enable) int ret; struct device *dev =3D &bsp_priv->pdev->dev; =20 - if (!ldo) - return 0; - if (enable) { ret =3D regulator_enable(ldo); if (ret) @@ -1636,14 +1633,11 @@ static struct rk_priv_data *rk_gmac_setup(struct pl= atform_device *pdev, } } =20 - bsp_priv->regulator =3D devm_regulator_get_optional(dev, "phy"); + bsp_priv->regulator =3D devm_regulator_get(dev, "phy"); if (IS_ERR(bsp_priv->regulator)) { - if (PTR_ERR(bsp_priv->regulator) =3D=3D -EPROBE_DEFER) { - dev_err(dev, "phy regulator is not available yet, deferred probing\n"); - return ERR_PTR(-EPROBE_DEFER); - } - dev_err(dev, "no regulator found\n"); - bsp_priv->regulator =3D NULL; + ret =3D PTR_ERR(bsp_priv->regulator); + dev_err_probe(dev, ret, "failed to get phy regulator\n"); + return ERR_PTR(ret); } =20 ret =3D of_property_read_string(dev->of_node, "clock_in_out", &strings); --=20 2.39.2