From nobody Tue Feb 10 01:19:35 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 07B1C30148B for ; Sun, 18 Jan 2026 18:10:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768759816; cv=none; b=tw7PGkuUn3jxYZAMZmXODUWrA9Ejhyl37U/hTV4k1aN9BK6126sHrCAhwiFj1ZEbI1NJaKi5g3mbJ+v8DOY3cuG4p5IKxv59wvE2nw8wjfzbmI4d08andOT0YFXBLGImI/8sQHQOSQX0IWy4PQ/3287hsWpHHV4wfRtzbnwtGa0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768759816; c=relaxed/simple; bh=Y+FQmd4rABqYPyTPKLcnkK9CTadziXSgsQ+69hWhimA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=scMO6rWkRka19wb604GrJ/kNgB4i4vToRY+1SSnu+HTQ6Ba5b0zZ/exKVJVkXh8eSzirYJVBwvcZJVVA6m/QOGHhyFIJjc56A3vl8k4tqz6gkdHIcte9qpmD6Ru4M1OtKYRg+sYKFG9YRG6VfaSevub0NealF8agg9NsDzun7do= 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=KXHpX1m8; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=J/g0n5jd; arc=none smtp.client-ip=205.220.168.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="KXHpX1m8"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="J/g0n5jd" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60IDQ9cV456045 for ; Sun, 18 Jan 2026 18:10:14 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=KXHpX1m8m3rn36Jg XAOXwYt+u9K3TjPostd/Ga+OJGx79TdYs516hJ7Uuj1DP0pic1AGnEgszDSbZwne PlDfhwKpRxALzLVi9/aOTpk6UditMnDm/26xLFGDtbrHEDQ8D8GdH0lLQR4Svsqo pnP7iEh9mMwx8zLBM9tlTFKD5OpkE0j97kbRdyVpYBq944m/m/NN6wbfgx+b0Do/ 6FHtL3IJp+oK9lZqxZHck0q7vU3B3O9QpoRqSvP9CfcaD0RXSV07ytsg3tCUjcGe ow5J9jBBcx1u5RbtkPZs81+1yN/7xDoG6TjVaRHXngafujCzRFemL8NSl76wwWQ1 /MK8Jw== 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 4br3kh2mcj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 18 Jan 2026 18:10:14 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8c5297cfe68so689258185a.0 for ; Sun, 18 Jan 2026 10:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768759813; x=1769364613; 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=J/g0n5jdcQUE+owZWh8f0ixZsjjcFKEsrEthDALT4qXVuN3bincC2HIMpfkrZMTh4E F6ZYpHGe8gTtE/Cz+ruiDswdlq+5LK3WnfP+hzz7bRWsorLUt5BT3iQCyXJ46zkhv9xR 44DcoFGfia5Gbof1i9J+JR/iTxyV2InAXy+73yzc86wjbRK5R41uIJctk4qPjWs22G3Q Udn+GfIxXvN173Dphws/rnHA/rRqw0T6IpPSVMHKMrTXKvf1bi7QWfnHP7neIp2spl4E QQt446WxZ6eANJt4nSwfHqX+Bi6axkGjvO9yYm7zMat3mJT4McKQOCnzrVbXA8cfJBT5 E5XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768759813; x=1769364613; 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=FIRWVhGtipS2AG6zQEsR4dKAbMCgOyxc730mnbx9ce+AWJVolGAHZ5o7LhfPkpz99d xvcEDZnrg962m8vmYkUVqi0bm3OtHWnwgZTzopFRntoj8fXf4n4YnTsNW/rh67ttLmuc h0ziexdgG0M1Mwj3Ap4RZUqS1B8kt3dFu+tQWXAXvnXy9MyL+ss6XWfz6BKnHi4RzY9n 5iFp5JxYL/0ywZO2SUhsq25omXjXusYm7UqdcvzSIlXdLRpgkKG0JwH55Kz7QIKOQrKp JtLVr92cRuM8al/j8rXeurLKHwyeDo41gJ/4AO9ITGJlsBQXnhlBSNj0qeiJdyLDbV75 qq/w== X-Forwarded-Encrypted: i=1; AJvYcCVnK4WZ0Pe/rJ6qiEoRTWo2cLDW6BF+BEYrnevPtd3y97YuO3sWZp4AtYOiQy4EjSiEjYqDSPp6E1D7Koc=@vger.kernel.org X-Gm-Message-State: AOJu0YyIvy2RnG/pY4BRpaQwRfq9wpNIEJ6hTif5VA1ML+cV+fUYDfCI iqI6lk32cf7ekjd115XC8/5fq0WYn9GZ9um43fS4mIHce/oUoE1IgHhI7EdYT5jGS6YsHqZXseL bGHmK5eiUsePGBcB63s/jJ7XebeJNmBhCxmrNXQYst88RTHfsNr1Y7O97nJJqVDEysbs= X-Gm-Gg: AY/fxX4lA+SSStvCouQ0gCyNNrm8eCHIqd8u5Fb9j1bBA49hAGbq1OL9zQqaCjK+S7Y 1/6qUYEUyqlbpKivAPGamldYfbj4Uj1WB/xiuNrz2Aj+WqN/k2Tl+DnmKkxCHqEJcQ/A5fnjLAH Uy+0ba5b/S7a4Fir432hDItMp8hEMNkPsGRymJDIgdonso+kHWMvOHdwHZUEXwSc9irz7zBUoNb LlGQWNZqZyK87inwJ08reh5mNPa10reVf5E3iMfqGVO287z41N5uRGHdCrJmdNU3PaSIdTAGQGU bTSB5Vt8jOPBSB0qSMclVDji4fLDc4Ugi8RJIFXiLMVP1YR81W4hACgQ4X13GO7C3YGgoJNxgaW D7Ip7l3Xj9EB+4N1CqBzbvnrk2hCpg3UC5g== X-Received: by 2002:a05:620a:4801:b0:89e:67a9:fced with SMTP id af79cd13be357-8c6a6789e6bmr1223537385a.66.1768759813364; Sun, 18 Jan 2026 10:10:13 -0800 (PST) X-Received: by 2002:a05:620a:4801:b0:89e:67a9:fced with SMTP id af79cd13be357-8c6a6789e6bmr1223533585a.66.1768759812755; Sun, 18 Jan 2026 10:10:12 -0800 (PST) Received: from [127.0.1.1] ([178.197.218.229]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801fe44b37sm62162085e9.12.2026.01.18.10.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 10:10:12 -0800 (PST) From: Krzysztof Kozlowski Date: Sun, 18 Jan 2026 19:09:28 +0100 Subject: [PATCH v2 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: <20260118-pinctrl-cleanup-guard-v2-5-bd36f681bdc0@oss.qualcomm.com> References: <20260118-pinctrl-cleanup-guard-v2-0-bd36f681bdc0@oss.qualcomm.com> In-Reply-To: <20260118-pinctrl-cleanup-guard-v2-0-bd36f681bdc0@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/ZANAwAKAcE3ZuaGi4PXAcsmYgBpbSHyayuoBeIp9CFs/To0KGzg5wtCKMQchY4rd ZTVsgBVTRyJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaW0h8gAKCRDBN2bmhouD 18jKD/0Q73dFNHHnrM5068MUNMPnIOmN7objobVATcjCxeNYoQiN8W7ivD4SWKVqA/DdX1R5St3 0/tCDBGqXO12+uj40UIZE4ljdgKCD+fsn+WSOyeGFeJIxnFDyd8A6kCV+M957Av09NHGOuZzCz1 n84LPH3ZRBC3uEP8gG7lVsIgTJ7Wd71Udx4I6Tf07bk7F2r+44NHCHKRtu55X8WAjRvLmynm86Z YOKnbZ2UCIUPJ62n3gMymM0/Ir+JkYjini6adzG92nXecsMf8J7ulbe3ZCqT5uJ5jTnZRR3KKGb psXi0oNg+Osb0wrW5nqR6O2Im3Oqs44dXVV3i/kbow6pNJeKSmmU5W+l68bvNbT281ghjvLIslY vvnRwxod3eZUawpDeP6T//3MNuKK2Gg8x9Lq9ey+ddE7nCFUTBA3ypX1ErFjwFg0DHDk12c8WII gi08BdhYaU8LtIxZzranwWhmvK3EgkrmYF+5lIoiIaY0e8XcmSW8WsiZCwrGUt/cBly3O7IY92Y FNoDXLaqmlFiFgTiMN2tVA1DpqquhFr/7fQp130j1BwOiRjF1OVqoVodqNKRPARHoBOIEmZMpIC PcI+/h6wyzJPyYXnC1UAQaCuoEGdkdUU7RcbXCWBfUmrFfqNlwHm1DgkCLMLdyMmi3GmnFcSM1m fHjfP614CxYOwQA== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE4MDE1OSBTYWx0ZWRfXyS+bcV6w/UGB 6JB2TXBK5fgYoY2+ZHeR5J8UQDtu3vJi5j5errMg46iNKuiJvL5oZ3arlHLffhqREKmJw2fcftO UA6uEjsKoHJEZaN+NIzx2AaVAYWRhQqBoaR/uTGi60iwPNEUnaWh6OEd0UkVTstv0FJcijsJyfK Erc6iGhdSzM0zRP31nDlIL8Lkuu5upUcpfcOdiNTrS2Rz7zd7sDIKdedeBvv+yGdCFaUrk8v9Yk Bgc16NfIQbdeULuVRZIJ2CuSIVW7RG9ta6I03832nRQFpd5BzQA6Tll3QpvOTx117y/FAyV/F22 boT5h2ily+6aU/Zr2xjqKwVZy6hjbhkk2BT8ztDKthBqPUF64zPrmMiw7aCXxQSYL2JAu/uHFyt 0SEPO7AW1m6iTeMz7JyFhYnfEAsbXvI5BwozDzKSa81a8E5xvdoFbAKRVtEyBBzr/Co8zZFtkMx nyp0VktRiMkS6aI8ljg== X-Proofpoint-ORIG-GUID: jEMUDnrLk03Jb_GTGYpH8xjOJ4M0seTY X-Authority-Analysis: v=2.4 cv=JcyxbEKV c=1 sm=1 tr=0 ts=696d2206 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-GUID: jEMUDnrLk03Jb_GTGYpH8xjOJ4M0seTY 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-17_03,2026-01-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601180159 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