From nobody Thu Dec 18 20:37:56 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 0A972C83F1D for ; Wed, 30 Aug 2023 19:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238871AbjH3T3u (ORCPT ); Wed, 30 Aug 2023 15:29:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343953AbjH3Rfh (ORCPT ); Wed, 30 Aug 2023 13:35:37 -0400 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F5C0198 for ; Wed, 30 Aug 2023 10:35:34 -0700 (PDT) Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4RbWfD3b6wzbv; Wed, 30 Aug 2023 19:35:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1693416932; bh=yfYWTZy4+QsJQZykgw/CudOAdR0bu9dW9lR7LaZnKiU=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=O6tvKnQHLzY4qcOxpg/QGuQ2ZJgasEn9jm2SSOWLR7p+w0oBFGJeVVvARTa/Efq5v YjU9Del7ANkyMGhmpBrKB5ChoVY3pR7gETGOFwP+uqDP0lJQE/Hwh9r4zfXqPnhQ7B CdmGXoGkOIHdk36acJW6hxAU9UBJ3TJ1OO0P1u7VwHcq3+gxpVG2KPSXwg6aGz3Xd1 1gX8Nh9zmZQOddCBKJRjVP3E+zLyQ9feMsR6WXn+5AhWMgWCa+DAhxxxlG5AXzZ6aX djtuJNjBUxV6Xb8FbE7hEIHm1HE47UNj2BViKjhqCJcZnVe2n+Cn0PVul6UBt/7QFH ltE6hFO8wZJNw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at mail Date: Wed, 30 Aug 2023 19:35:32 +0200 Message-Id: <3708ae89092b13b1f2598b6a3c02987d6d920e4d.1693416477.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: Subject: [PATCH v2 4/7] regulator/core: regulator_resolve_supply: remove gotos MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= To: Liam Girdwood , Mark Brown Cc: Douglas Anderson , linux-kernel@vger.kernel.org, Stephen Boyd Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since 14a71d509ac8 ("Fix lockdep warning resolving supplies") the `out` label is just `return ret;`. Inline it for easier reading. Reviewed-by: Douglas Anderson Signed-off-by: Micha=C5=82 Miros=C5=82aw --- drivers/regulator/core.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f18e7cb88a0d..e89c12d27a9d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2039,7 +2039,7 @@ static int regulator_resolve_supply(struct regulator_= dev *rdev) struct regulator_dev *r; struct device *dev =3D rdev->dev.parent; struct ww_acquire_ctx ww_ctx; - int ret =3D 0; + int ret; =20 /* No supply to resolve? */ if (!rdev->supply_name) @@ -2055,7 +2055,7 @@ static int regulator_resolve_supply(struct regulator_= dev *rdev) =20 /* Did the lookup explicitly defer for us? */ if (ret =3D=3D -EPROBE_DEFER) - goto out; + return ret; =20 if (have_full_constraints()) { r =3D dummy_regulator_rdev; @@ -2063,18 +2063,15 @@ static int regulator_resolve_supply(struct regulato= r_dev *rdev) } else { dev_err(dev, "Failed to resolve %s-supply for %s\n", rdev->supply_name, rdev->desc->name); - ret =3D -EPROBE_DEFER; - goto out; + return -EPROBE_DEFER; } } =20 if (r =3D=3D rdev) { dev_err(dev, "Supply for %s (%s) resolved to itself\n", rdev->desc->name, rdev->supply_name); - if (!have_full_constraints()) { - ret =3D -EINVAL; - goto out; - } + if (!have_full_constraints()) + return -EINVAL; r =3D dummy_regulator_rdev; get_device(&r->dev); } @@ -2088,8 +2085,7 @@ static int regulator_resolve_supply(struct regulator_= dev *rdev) if (r->dev.parent && r->dev.parent !=3D rdev->dev.parent) { if (!device_is_bound(r->dev.parent)) { put_device(&r->dev); - ret =3D -EPROBE_DEFER; - goto out; + return -EPROBE_DEFER; } } =20 @@ -2097,7 +2093,7 @@ static int regulator_resolve_supply(struct regulator_= dev *rdev) ret =3D regulator_resolve_supply(r); if (ret < 0) { put_device(&r->dev); - goto out; + return ret; } =20 /* @@ -2111,14 +2107,14 @@ static int regulator_resolve_supply(struct regulato= r_dev *rdev) if (rdev->supply) { regulator_unlock_two(rdev, r, &ww_ctx); put_device(&r->dev); - goto out; + return 0; } =20 ret =3D set_supply(rdev, r); if (ret < 0) { regulator_unlock_two(rdev, r, &ww_ctx); put_device(&r->dev); - goto out; + return ret; } =20 regulator_unlock_two(rdev, r, &ww_ctx); @@ -2133,12 +2129,11 @@ static int regulator_resolve_supply(struct regulato= r_dev *rdev) if (ret < 0) { _regulator_put(rdev->supply); rdev->supply =3D NULL; - goto out; + return ret; } } =20 -out: - return ret; + return 0; } =20 /* Internal regulator request function */ --=20 2.39.2