Re: [PATCH 09/11] pinctrl: tegra-xusb: Simplify locking with guard()
Krzysztof Kozlowski <[email protected]>
| Newsgroups | dev.linux.lists.sophgo,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-gpio,org.kernel.vger.linux-kernel,org.kernel.vger.linux-tegra,org.ozlabs.lists.linux-aspeed,org.ozlabs.lists.openbmc |
|---|---|
| Message-ID | <[email protected]> |
On 14/01/2026 16:51, Jon Hunter wrote: > > On 14/01/2026 15:30, Krzysztof Kozlowski wrote: >> Simplify error handling (less gotos) over locks with guard(). >> >> Signed-off-by: Krzysztof Kozlowski <[email protected]> >> --- >> drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 14 +++++--------- >> 1 file changed, 5 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c >> index 34a373f7e04d..855f708ce510 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; >> @@ -499,7 +499,6 @@ static void tegra_xusb_padctl_enable(struct tegra_xusb_padctl *padctl) >> value &= ~XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN; >> padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM); >> >> -out: >> mutex_unlock(&padctl->lock); >> } > > > I believe we need to remove the above unlock too? Uh, of course, thanks. Some rebasing mixup on my side. Best regards, Krzysztof