From: David Lechner <dlechner@baylibre.com>
To: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>,
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
Subject: Re: [PATCH v2 10/11] pinctrl: rockchip: Simplify locking with scoped_guard()
Date: Sun, 22 Feb 2026 18:12:00 -0600 [thread overview]
Message-ID: <f5b38942-a584-4e78-a893-de4a219070b2@baylibre.com> (raw)
In-Reply-To: <20260118-pinctrl-cleanup-guard-v2-10-bd36f681bdc0@oss.qualcomm.com>
On 1/18/26 12:09 PM, Krzysztof Kozlowski wrote:
> Simplify error handling by removing two mutex_unlock() calls with
> scoped_guard().
>
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
> ---
> 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,
Filling in some context from the existing code...
for (i = 0; i < num_configs; i++) {
param = pinconf_to_config_param(configs[i]);
arg = pinconf_to_config_argument(configs[i]);
if (param == PIN_CONFIG_LEVEL || param == PIN_CONFIG_INPUT_ENABLE) {
/*
* Check for gpio driver not being probed yet.
> * 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;
I think there is an unintentional change here.
scoped_guard() is implemented by a for loop. So the break statement is now
breaking out of the scoped_guard() scope rather than breaking out of the
outer for loop.
> + }
> }
> - mutex_unlock(&bank->deferred_lock);
> }
>
> switch (param) {
>
next prev parent reply other threads:[~2026-02-23 0:12 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 ` [PATCH v2 09/11] pinctrl: tegra-xusb: Simplify locking with guard() Krzysztof Kozlowski
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 [this message]
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=f5b38942-a584-4e78-a893-de4a219070b2@baylibre.com \
--to=dlechner@baylibre.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=krzysztof.kozlowski@oss.qualcomm.com \
--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®