From nobody Mon Feb 9 18:18:24 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AD1339E165 for ; Wed, 14 Jan 2026 15:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768404634; cv=none; b=W0IFw8gMGYIzDKLKAL8+HAJq2842EmC66oikoohn+tfhcMQ4kP2aowZRzlJxuLEy21wG1qlWR76KMXhJHG0EVoVTkqfj0Q1C2keRKqdd3cr6FhFugCQ6+B1UnMN1vpYyIbqT4cqD1cxameQS+YXQuR44Zy7ekUYGWnlbedlcmao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768404634; c=relaxed/simple; bh=Y+FQmd4rABqYPyTPKLcnkK9CTadziXSgsQ+69hWhimA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uwgl02QpDH1sfL2Q6UzMcyOM5SCHWolVZfAnO3GEIvZzE2YfUifH2YWJqamPdGQadGpqMK3oZiKGJhQ1k/yrjz0J65F0Q3sZ8jy5DTkFiYoKMHIhS0N7LCNOmKYORdhqjQB4PijwxOue/lkfjM4AOY9aJnFbjq4Yn9ZT1LbSUkY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=L1bLn2gb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=USRXZ/5v; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="L1bLn2gb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="USRXZ/5v" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60E9I7fc2552672 for ; Wed, 14 Jan 2026 15:30:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= LXncEA4jW+AgdDM8Dn/nTshgL+Kv2q2dFOJVpt182v4=; b=L1bLn2gbhX1VQr5S DBrqZ854pXa6x0jHP6ADw0uJYdtEFgDvE4gD9u6gpzd62HMPmU14Zz2Yz+ffZGY8 VY/nvssh6dZj5GnrLthMKJcVupO8HTQMojR7ZkiDkKR0XFxxqvBJUeKWNMxYJry8 NwvqTbbKWLT75tdRH/42GO0jHIG6tsYxJZYxIt3+vwRt9jLFxqCKxsZvqH+nzhSP P37BGhyoY19MnsR0mwirGBB8vtCkN84A5wrbld369kXozOtYajjOcHWpNhrbOtSR u9dn/SmYXI+2ecIuTkyBKquonCEcC6bun8mA6WiUKZcz7VQzS0X7Qy1Zb+WncMs5 /6FpjQ== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bp8d318av-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 14 Jan 2026 15:30:30 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8bc4493d315so2259800585a.1 for ; Wed, 14 Jan 2026 07:30:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768404630; x=1769009430; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LXncEA4jW+AgdDM8Dn/nTshgL+Kv2q2dFOJVpt182v4=; b=USRXZ/5vyyc03G4RmQx0GeAdbEjVic2Sn4FXzEtVVrYnETjHx1Q8Xq395cVV8fXE0N jrJ7mUt76ESQJxrjumop1bJgYYUGzNPqstGSXjm8+Svjx1iiFCKnUeKsHBQMtwlH5XK7 w4xfH7uQxn+RiGx8IeShtU1zVnptbPGcFHKQtHQAzU3m86w6VIW0H4oWtxHnUN28Koim D2RFyZbzURLZR/QgI0zHUf/RPOHmN/X6QByMzH5JIQ+j3zG+Dz9TRsGv21di1M/KLa6C j7zNtH258w5+mOKsSKBZCgKtAt73UqvC7lpD5o7pgZyu4ZZx85+qsFubYPONNUmnyuHH 8MKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768404630; x=1769009430; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LXncEA4jW+AgdDM8Dn/nTshgL+Kv2q2dFOJVpt182v4=; b=ix0Y3BAEglWrRas/zrYgS673gypr/XvWOvNG5Fi8V8gH2sS0fof29mZrbxJkBwCJPH rNW+N66EM8X9IBxgmN0VcqJanfKAiWkEHCZWXXvsZMK0rrzCT1kTGbKh+KKNNQ+JndQs yObJBucF0oluxWKn85zmv5twr99RCJPNf5X1QCg4giCEJc697A9OdhBeP5uR0+FcHwqE lsPUlQq6hF0wA77I2zo+VjgkWidomfEAUb9Z1MjhxATBUXX1MyhdvdWZvdf3bt7FEjlE RxSYc0j7307eHvNdEUjJVhRBBW/Vxo7MOMlssZSPtmH/obLX38NmsM7OUhoX1lsBZOzt 8Hdg== X-Forwarded-Encrypted: i=1; AJvYcCVpGV1iHS1gSzyd0MkDEn5Xff2LZvgUvw5c8XZyKahgu5yURCf/jB7cnau5j/ZpYXPqqJ1e2cxiCZ+ZJjY=@vger.kernel.org X-Gm-Message-State: AOJu0YxoG+i5PzIS5BUuNfI3A1fFbqQ6Gsu920NvsGEf5S6pbGjtS3AT 6l/+MY9yz9v5N3JzQV+po+5WTrZkSYREUg/uxz4MCFBottMr60K7tF3Se641dUVhpJq1PcTKceU m8QsRjK619nYq1gV5HtAuqhCYwvD7u+YeWVS8jEmyykK34rfJPj1vv9Pcb9QhiE2FR+I= X-Gm-Gg: AY/fxX6RWxIwHYkIuyNOtjmuvcNwCNuVD0eOcUgqNhjLWXwhmYVy0R+NgZ+lhLOQpuz XuwEgL7LZ6jEInqCYFlsDlufbCitwQig5AL8kT/0HQzVpnbb/9WFXdBU5L14PQrvR8h5tslFtvQ BIgY4/VqBwggRnxPMxapxQLCkW7qukNcDnfu4zqnJAWPrEQgnpk5cVjLAfzrtGFGD3Geha+x72t bJp7kFUiEhCSPgyIDK27JRK6HD/oYwvoClljwao38sF7f7Cn1xYdsj824CVBj7nFHfJ71fsvPmS yOQ2lChnSI0Zqgy0c3/wC8LJf2d+a3qG9MtUYwUjoD8gJIdAZRBfypA0z67ylDjlDZWsCO62mCO rhqcMPOf+XvUP4FHGRW6bu/OWSOIwRe6ttw== X-Received: by 2002:a05:620a:4804:b0:8c5:1fb5:1631 with SMTP id af79cd13be357-8c52fbcf18fmr431954485a.76.1768404630168; Wed, 14 Jan 2026 07:30:30 -0800 (PST) X-Received: by 2002:a05:620a:4804:b0:8c5:1fb5:1631 with SMTP id af79cd13be357-8c52fbcf18fmr431947685a.76.1768404629608; Wed, 14 Jan 2026 07:30:29 -0800 (PST) Received: from [127.0.1.1] ([178.197.218.229]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6507bf667fcsm22812989a12.29.2026.01.14.07.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 07:30:29 -0800 (PST) From: Krzysztof Kozlowski Date: Wed, 14 Jan 2026 16:30:06 +0100 Subject: [PATCH 05/11] pinctrl: aw9523: Simplify locking with guard() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260114-pinctrl-cleanup-guard-v1-5-a14572685cd3@oss.qualcomm.com> References: <20260114-pinctrl-cleanup-guard-v1-0-a14572685cd3@oss.qualcomm.com> In-Reply-To: <20260114-pinctrl-cleanup-guard-v1-0-a14572685cd3@oss.qualcomm.com> To: Andrew Jeffery , Linus Walleij , Joel Stanley , Emil Renner Berthing , Hal Feng , Chen Wang , Inochi Amaoto , Basavaraj Natikar , Shyam Sundar S K , Bartosz Golaszewski , Steen Hegelund , Daniel Machon , UNGLinuxDriver@microchip.com, Thierry Reding , Jonathan Hunter , Heiko Stuebner , Patrice Chotard 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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4481; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=Y+FQmd4rABqYPyTPKLcnkK9CTadziXSgsQ+69hWhimA=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpZ7aELAglkIA71S9aDHg8tY0ki5ruKpcTIipIp 9RdX4NrwWOJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaWe2hAAKCRDBN2bmhouD 1/igD/9PwYlGol1XFHKqtfTdSYI+oQLSjl0z2sqJC/KrK4RW/0UQiErzillTKszLs1fzun100dI EhV3/cNFb7EkGAiUv0DOTJm2rLXXXAEKq4sfHj2AvOo4AOdm1Vhzaxohnqhz8lbieU5tgItO8kM CikX6JY0DNIPuK8tFa3jeDEczOXlluE7E41BjdvQjxbKKo8CAfks/3wwtIsxd1meu0Uh7pDT24v aYd+vgDxKOiXkiRG+CUevINMLknU969di7fKX4meZYuzU3R9984ZwT3wKVcWI1thioeP3d0iKIZ BLsydRVePUf0VtejFOq22/8mIaGexs7h91zpasohVsgWexuKGuKJNsUuVOnAKfAxsGZjauTVDrL 18hpyd0FGakefMHY330a0Z2lqwnCW9k43rDquioM3Bdk17JEYl8zl6Ke/SDgqPsWJjHmhjt99ld hGunGrieUUrlWbMED9RW+3E0q0mHN8hMeN8k3fFjaBxIE0ScSmF/3Ln/vbtAuQF19W3wAWGZaJY GtZjFlirhF09jNZdVRAU8jaxTE4Y1Xh+h4BXysH0im9u+xRCGpdGx49RemYsLFWX5SsXtSUWzJE 4DUYUyd6Czhj6ON/2GFFww6B8ToMmkk78qjK6kFM6DwCDfpPDItQEKm0PHRqNap0/QZwJwiIuvB W8opp7AXG42HEmA== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-GUID: J3bMuom1REVTGmJpUwOYjtC9fYDhtrZs X-Authority-Analysis: v=2.4 cv=fbWgCkQF c=1 sm=1 tr=0 ts=6967b697 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=Eb9f15NH/cHKzfGOmZSO4Q==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=sJPWbbE6un6nfY-uGV8A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: J3bMuom1REVTGmJpUwOYjtC9fYDhtrZs X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDEzMCBTYWx0ZWRfX0GVTnOsH8F7x 3YORVxuSkhqYpGhqg3bIoEvT33u1ATiHWghsTrl/5FCTjO5NJvzygKJ4wnO6RUiWQ7xjgjKIvsZ vcgd77gDAn/CJluWTiGZWrQNOq2a1rE0FzvoaFZFHU0lt6UpZXmJT2OMFlVuGOd11uokdsDAyJs AIFwxBtj7sFNQ3c23H19e2/kR3pBcxDvRYO/1WBS7vci/UGSeBwfR+2tmh/L53rFrU49PdSgLp1 fwJBpAzJrJ79nBLhwtUjQRqlbeqTmdsyxb7x44vD3JUFfCOxi7O/8zOHdtqgbsfQLmweewBPPRh HYkOi9KGMCUrVbNVtp2BgjWBruOBBbsjzcmgd8/ZokLJYYusg7ENsyIJZpV8aUlWA7wIUYXMz1S S3dsbOm1sjgh7PE2ehfAcmeAM1pbEIeHn0pRxAabgIfAoFdlhwfHJDi5+m2KS9WUaLzl7Rzb88n Reatoxxr5vVqz4KO5Xg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_04,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 impostorscore=0 phishscore=0 priorityscore=1501 adultscore=0 clxscore=1015 malwarescore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601140130 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 --- 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-aw9= 523.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 *pctld= ev, unsigned int pin, unsigned int mask, val; int i, rc; =20 - mutex_lock(&awi->i2c_lock); + guard(mutex)(&awi->i2c_lock); for (i =3D 0; i < num_configs; i++) { param =3D pinconf_to_config_param(configs[i]); arg =3D pinconf_to_config_argument(configs[i]); =20 rc =3D aw9523_pcfg_param_to_reg(param, pin, ®); if (rc) - goto end; + return rc; =20 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; =20 /* Then, fall through to config output level */ fallthrough; @@ -323,10 +323,9 @@ static int aw9523_pconf_set(struct pinctrl_dev *pctlde= v, unsigned int pin, break; case PIN_CONFIG_DRIVE_OPEN_DRAIN: /* Open-Drain is supported only on port 0 */ - if (pin >=3D AW9523_PINS_PER_PORT) { - rc =3D -ENOTSUPP; - goto end; - } + if (pin >=3D AW9523_PINS_PER_PORT) + return -ENOTSUPP; + mask =3D AW9523_GCR_GPOMD_MASK; val =3D 0; break; @@ -341,17 +340,15 @@ static int aw9523_pconf_set(struct pinctrl_dev *pctld= ev, unsigned int pin, val =3D AW9523_GCR_GPOMD_MASK; break; default: - rc =3D -ENOTSUPP; - goto end; + return -ENOTSUPP; } =20 rc =3D regmap_update_bits(awi->regmap, reg, mask, val); if (rc) - goto end; + return rc; } -end: - mutex_unlock(&awi->i2c_lock); - return rc; + + return 0; } =20 static const struct pinconf_ops aw9523_pinconf_ops =3D { @@ -599,14 +596,14 @@ static int aw9523_gpio_get_multiple(struct gpio_chip = *chip, u8 m, state =3D 0; int ret; =20 - mutex_lock(&awi->i2c_lock); + guard(mutex)(&awi->i2c_lock); =20 /* Port 0 (gpio 0-7) */ m =3D *mask; if (m) { ret =3D _aw9523_gpio_get_multiple(awi, 0, &state, m); if (ret) - goto out; + return ret; } *bits =3D state; =20 @@ -616,13 +613,12 @@ static int aw9523_gpio_get_multiple(struct gpio_chip = *chip, ret =3D _aw9523_gpio_get_multiple(awi, AW9523_PINS_PER_PORT, &state, m); if (ret) - goto out; + return ret; =20 *bits |=3D (state << 8); } -out: - mutex_unlock(&awi->i2c_lock); - return ret; + + return 0; } =20 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 =3D gpiochip_get_data(chip); u8 mask_lo, mask_hi, bits_lo, bits_hi; unsigned int reg; - int ret =3D 0; + int ret; =20 mask_lo =3D *mask; mask_hi =3D *mask >> 8; bits_lo =3D *bits; bits_hi =3D *bits >> 8; =20 - mutex_lock(&awi->i2c_lock); + guard(mutex)(&awi->i2c_lock); if (mask_hi) { reg =3D AW9523_REG_OUT_STATE(AW9523_PINS_PER_PORT); ret =3D regmap_write_bits(awi->regmap, reg, mask_hi, bits_hi); if (ret) - goto out; + return ret; } if (mask_lo) { reg =3D AW9523_REG_OUT_STATE(0); ret =3D regmap_write_bits(awi->regmap, reg, mask_lo, bits_lo); if (ret) - goto out; + return ret; } =20 -out: - mutex_unlock(&awi->i2c_lock); - return ret; + return 0; } =20 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 =3D offset % AW9523_PINS_PER_PORT; int ret; =20 - mutex_lock(&awi->i2c_lock); + guard(mutex)(&awi->i2c_lock); ret =3D regmap_update_bits(awi->regmap, AW9523_REG_OUT_STATE(offset), BIT(regbit), value ? BIT(regbit) : 0); if (ret) - goto end; + return ret; =20 ret =3D regmap_update_bits(awi->regmap, AW9523_REG_CONF_STATE(offset), BIT(regbit), 0); -end: - mutex_unlock(&awi->i2c_lock); + return ret; } =20 --=20 2.51.0