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 05/11] pinctrl: aw9523: Simplify locking with guard()
Date: Sun, 18 Jan 2026 19:09:28 +0100 [thread overview]
Message-ID: <20260118-pinctrl-cleanup-guard-v2-5-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() which also
removes possibility (at least by reading the code) of returning
uninitialized rc/ret value in aw9523_pconf_set() and
aw9523_gpio_get_multiple() functions.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
drivers/pinctrl/pinctrl-aw9523.c | 53 +++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 30 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-aw9523.c b/drivers/pinctrl/pinctrl-aw9523.c
index 479553a79216..02a24ac87ea4 100644
--- a/drivers/pinctrl/pinctrl-aw9523.c
+++ b/drivers/pinctrl/pinctrl-aw9523.c
@@ -291,14 +291,14 @@ static int aw9523_pconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
unsigned int mask, val;
int i, rc;
- mutex_lock(&awi->i2c_lock);
+ guard(mutex)(&awi->i2c_lock);
for (i = 0; i < num_configs; i++) {
param = pinconf_to_config_param(configs[i]);
arg = pinconf_to_config_argument(configs[i]);
rc = aw9523_pcfg_param_to_reg(param, pin, ®);
if (rc)
- goto end;
+ return rc;
switch (param) {
case PIN_CONFIG_LEVEL:
@@ -307,7 +307,7 @@ static int aw9523_pconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
AW9523_REG_CONF_STATE(pin),
BIT(regbit), 0);
if (rc)
- goto end;
+ return rc;
/* Then, fall through to config output level */
fallthrough;
@@ -323,10 +323,9 @@ static int aw9523_pconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
break;
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
/* Open-Drain is supported only on port 0 */
- if (pin >= AW9523_PINS_PER_PORT) {
- rc = -ENOTSUPP;
- goto end;
- }
+ if (pin >= AW9523_PINS_PER_PORT)
+ return -ENOTSUPP;
+
mask = AW9523_GCR_GPOMD_MASK;
val = 0;
break;
@@ -341,17 +340,15 @@ static int aw9523_pconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
val = AW9523_GCR_GPOMD_MASK;
break;
default:
- rc = -ENOTSUPP;
- goto end;
+ return -ENOTSUPP;
}
rc = regmap_update_bits(awi->regmap, reg, mask, val);
if (rc)
- goto end;
+ return rc;
}
-end:
- mutex_unlock(&awi->i2c_lock);
- return rc;
+
+ return 0;
}
static const struct pinconf_ops aw9523_pinconf_ops = {
@@ -599,14 +596,14 @@ static int aw9523_gpio_get_multiple(struct gpio_chip *chip,
u8 m, state = 0;
int ret;
- mutex_lock(&awi->i2c_lock);
+ guard(mutex)(&awi->i2c_lock);
/* Port 0 (gpio 0-7) */
m = *mask;
if (m) {
ret = _aw9523_gpio_get_multiple(awi, 0, &state, m);
if (ret)
- goto out;
+ return ret;
}
*bits = state;
@@ -616,13 +613,12 @@ static int aw9523_gpio_get_multiple(struct gpio_chip *chip,
ret = _aw9523_gpio_get_multiple(awi, AW9523_PINS_PER_PORT,
&state, m);
if (ret)
- goto out;
+ return ret;
*bits |= (state << 8);
}
-out:
- mutex_unlock(&awi->i2c_lock);
- return ret;
+
+ return 0;
}
static int aw9523_gpio_set_multiple(struct gpio_chip *chip,
@@ -632,30 +628,28 @@ static int aw9523_gpio_set_multiple(struct gpio_chip *chip,
struct aw9523 *awi = gpiochip_get_data(chip);
u8 mask_lo, mask_hi, bits_lo, bits_hi;
unsigned int reg;
- int ret = 0;
+ int ret;
mask_lo = *mask;
mask_hi = *mask >> 8;
bits_lo = *bits;
bits_hi = *bits >> 8;
- mutex_lock(&awi->i2c_lock);
+ guard(mutex)(&awi->i2c_lock);
if (mask_hi) {
reg = AW9523_REG_OUT_STATE(AW9523_PINS_PER_PORT);
ret = regmap_write_bits(awi->regmap, reg, mask_hi, bits_hi);
if (ret)
- goto out;
+ return ret;
}
if (mask_lo) {
reg = AW9523_REG_OUT_STATE(0);
ret = regmap_write_bits(awi->regmap, reg, mask_lo, bits_lo);
if (ret)
- goto out;
+ return ret;
}
-out:
- mutex_unlock(&awi->i2c_lock);
- return ret;
+ return 0;
}
static int aw9523_gpio_set(struct gpio_chip *chip, unsigned int offset,
@@ -695,16 +689,15 @@ static int aw9523_direction_output(struct gpio_chip *chip,
u8 regbit = offset % AW9523_PINS_PER_PORT;
int ret;
- mutex_lock(&awi->i2c_lock);
+ guard(mutex)(&awi->i2c_lock);
ret = regmap_update_bits(awi->regmap, AW9523_REG_OUT_STATE(offset),
BIT(regbit), value ? BIT(regbit) : 0);
if (ret)
- goto end;
+ return ret;
ret = regmap_update_bits(awi->regmap, AW9523_REG_CONF_STATE(offset),
BIT(regbit), 0);
-end:
- mutex_unlock(&awi->i2c_lock);
+
return ret;
}
--
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 ` Krzysztof Kozlowski [this message]
2026-01-18 18:09 ` [PATCH v2 06/11] pinctrl: microchip-sgpio: Simplify locking with guard() 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
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-5-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®