From: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
To: Andrew Jeffery <andrew@codeconstruct.com.au>,
Linus Walleij <linusw@kernel.org>, Joel Stanley <joel@jms.id.au>,
Emil Renner Berthing <kernel@esmil.dk>,
Hal Feng <hal.feng@starfivetech.com>,
Chen Wang <unicorn_wang@outlook.com>,
Inochi Amaoto <inochiama@gmail.com>,
Basavaraj Natikar <Basavaraj.Natikar@amd.com>,
Shyam Sundar S K <Shyam-sundar.S-k@amd.com>,
Bartosz Golaszewski <brgl@kernel.org>,
Steen Hegelund <Steen.Hegelund@microchip.com>,
Daniel Machon <daniel.machon@microchip.com>,
UNGLinuxDriver@microchip.com,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Heiko Stuebner <heiko@sntech.de>,
Patrice Chotard <patrice.chotard@foss.st.com>
Cc: linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org,
linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, sophgo@lists.linux.dev,
linux-tegra@vger.kernel.org, linux-rockchip@lists.infradead.org,
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Subject: [PATCH v2 09/11] pinctrl: tegra-xusb: Simplify locking with guard()
Date: Sun, 18 Jan 2026 19:09:32 +0100 [thread overview]
Message-ID: <20260118-pinctrl-cleanup-guard-v2-9-bd36f681bdc0@oss.qualcomm.com> (raw)
In-Reply-To: <20260118-pinctrl-cleanup-guard-v2-0-bd36f681bdc0@oss.qualcomm.com>
Simplify error handling (less gotos) over locks with guard().
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
Changes in v2:
1. Drop stale mutex_unlock (Jon)
---
drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
index 34a373f7e04d..c6a51bb21215 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
@@ -478,10 +478,10 @@ static void tegra_xusb_padctl_enable(struct tegra_xusb_padctl *padctl)
{
u32 value;
- mutex_lock(&padctl->lock);
+ guard(mutex)(&padctl->lock);
if (padctl->enable++ > 0)
- goto out;
+ return;
value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM);
value &= ~XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_CLAMP_EN;
@@ -498,22 +498,19 @@ static void tegra_xusb_padctl_enable(struct tegra_xusb_padctl *padctl)
value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM);
value &= ~XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN;
padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM);
-
-out:
- mutex_unlock(&padctl->lock);
}
static void tegra_xusb_padctl_disable(struct tegra_xusb_padctl *padctl)
{
u32 value;
- mutex_lock(&padctl->lock);
+ guard(mutex)(&padctl->lock);
if (WARN_ON(padctl->enable == 0))
- goto out;
+ return;
if (--padctl->enable > 0)
- goto out;
+ return;
value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM);
value |= XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN;
@@ -530,9 +527,6 @@ static void tegra_xusb_padctl_disable(struct tegra_xusb_padctl *padctl)
value = padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM);
value |= XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_CLAMP_EN;
padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM);
-
-out:
- mutex_unlock(&padctl->lock);
}
static int tegra_xusb_phy_init(struct phy *phy)
--
2.51.0
next prev parent reply other threads:[~2026-01-18 18:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-18 18:09 [PATCH v2 00/11] pinctrl: Some code cleanup including guards Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 01/11] pinctrl: aspeed: Cleanup header includes Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 02/11] pinctrl: starfive: jh7110-sys: " Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 03/11] pinctrl: sophgo: " Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 04/11] pinctrl: amd: " Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 05/11] pinctrl: aw9523: Simplify locking with guard() Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 06/11] pinctrl: microchip-sgpio: " Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 07/11] pinctrl: tb10x: " Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 08/11] pinctrl: tegra-xusb: Return void in padctl enable/disable functions Krzysztof Kozlowski
2026-01-18 18:09 ` Krzysztof Kozlowski [this message]
2026-01-18 18:09 ` [PATCH v2 10/11] pinctrl: rockchip: Simplify locking with scoped_guard() Krzysztof Kozlowski
2026-02-23 0:12 ` David Lechner
2026-02-23 9:48 ` Krzysztof Kozlowski
2026-01-18 18:09 ` [PATCH v2 11/11] pinctrl: st: Annotate st_pinconf_dbg_show() as holding mutex Krzysztof Kozlowski
2026-01-19 0:12 ` [PATCH v2 00/11] pinctrl: Some code cleanup including guards Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260118-pinctrl-cleanup-guard-v2-9-bd36f681bdc0@oss.qualcomm.com \
--to=krzysztof.kozlowski@oss.qualcomm.com \
--cc=Basavaraj.Natikar@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=Steen.Hegelund@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@codeconstruct.com.au \
--cc=brgl@kernel.org \
--cc=daniel.machon@microchip.com \
--cc=hal.feng@starfivetech.com \
--cc=heiko@sntech.de \
--cc=inochiama@gmail.com \
--cc=joel@jms.id.au \
--cc=jonathanh@nvidia.com \
--cc=kernel@esmil.dk \
--cc=linusw@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-tegra@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=patrice.chotard@foss.st.com \
--cc=sophgo@lists.linux.dev \
--cc=thierry.reding@gmail.com \
--cc=unicorn_wang@outlook.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®