[PATCH 10/11] pinctrl: rockchip: Simplify locking with scoped_guard()
From: Krzysztof Kozlowski <hidden>
Date: 2026-01-14 15:30:42
Also in:
linux-aspeed, linux-gpio, linux-rockchip, linux-tegra, lkml, openbmc
Subsystem:
arm/rockchip soc support, pin control subsystem, the rest · Maintainers:
Heiko Stuebner, Linus Walleij, Linus Torvalds
Simplify error handling by removing two mutex_unlock() calls with scoped_guard(). Signed-off-by: Krzysztof Kozlowski <redacted> --- drivers/pinctrl/pinctrl-rockchip.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index e44ef262beec..bbe1cf712965 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c@@ -3640,17 +3640,16 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, * The lock makes sure that either gpio-probe has completed * or the gpio driver hasn't probed yet. */ - mutex_lock(&bank->deferred_lock); - if (!gpio || !gpio->direction_output) { - rc = rockchip_pinconf_defer_pin(bank, pin - bank->pin_base, param, - arg); - mutex_unlock(&bank->deferred_lock); - if (rc) - return rc; - - break; + scoped_guard(mutex, &bank->deferred_lock) { + if (!gpio || !gpio->direction_output) { + rc = rockchip_pinconf_defer_pin(bank, + pin - bank->pin_base, + param, arg); + if (rc) + return rc; + break; + } } - mutex_unlock(&bank->deferred_lock); } switch (param) {
--
2.51.0