From nobody Wed Dec 17 16:12:51 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 9A7EAEE49A3 for ; Sun, 20 Aug 2023 02:33:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229782AbjHTCdd (ORCPT ); Sat, 19 Aug 2023 22:33:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229577AbjHTCdb (ORCPT ); Sat, 19 Aug 2023 22:33:31 -0400 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F1DCD36ED for ; Sat, 19 Aug 2023 15:46:12 -0700 (PDT) Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4RSv3k2fFyzK2; Sun, 20 Aug 2023 00:46:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1692485170; bh=DzbAdMU1wYIUdh1RzwXFx3KnrimKqCQ/g0WN0DovXFY=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=L9cAYUBDSJfCLdNseZgTZq0aRnoHObflbZSEUyJ762UQQKzOTC3UJbMbL48o89k28 tzB4F7YA78Thz/J1pJh0gSYKRx/vhBkoPYRQIEXe/XGeiwhkEBmBXuWsAhbbWy8bUO SrzUDH6kIRM2OeFZmaLTWlvxmMf9/L2i99+J6Ihx5NhPY0e45UcPgWDZtVtZOXJE1m j86Qq1Aonff5cz4CiMkqLpp41dQSzmbIE4uiqjdzFJEL3/kQc1E0uM5BZxjw85evXX EvFSVS2aEYK1y5U7QpwSx/RTiEgnatVloWc2anTewStx5n3liNzmUCiB6mNunxZQJI T6DOfImXjiXmQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at mail Date: Sun, 20 Aug 2023 00:46:10 +0200 Message-Id: In-Reply-To: References: Subject: [PATCH 4/6] regulator: core: remove `goto`s from resolve_supply() 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: linux-kernel@vger.kernel.org, Dmitry Osipenko , Douglas Anderson 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. Signed-off-by: Micha=C5=82 Miros=C5=82aw Reviewed-by: Douglas Anderson --- drivers/regulator/core.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 87e54b776a0f..de434d550937 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2053,11 +2053,9 @@ static int regulator_resolve_supply(struct regulator= _dev *rdev) =20 r =3D regulator_dev_lookup(dev, rdev->supply_name); if (IS_ERR(r)) { - ret =3D PTR_ERR(r); - /* Did the lookup explicitly defer for us? */ - if (ret =3D=3D -EPROBE_DEFER) - goto out; + if (PTR_ERR(r) =3D=3D -EPROBE_DEFER) + return -EPROBE_DEFER; =20 if (have_full_constraints()) { r =3D dummy_regulator_rdev; @@ -2065,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); } @@ -2090,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 @@ -2099,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 /* @@ -2113,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); @@ -2135,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