From nobody Mon Feb 9 19:52:14 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 A66792FE071 for ; Sun, 18 Jan 2026 18:10:26 +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=1768759832; cv=none; b=cO6KTYAM1PBEE8rZM966kWnFKrao675kR02l/GmL9+P3sUtLQCE+8La4fuAa+EbDotxJ1hoLpxISvuWTDBrku2cvbC8of5gY7kjPRxjzdxw/qJSeR60eEL79Hy3e0cmwaqHbIHGTnj3yiH51FQywcslw3gu8QJANQMbdMptWA5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768759832; c=relaxed/simple; bh=xHpKv/L+LPsJ9X96+TG0TkMyLzJ8lmjqPrbjckpJnLU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aygmJOf9QeL4RGuJW+I9qfPcEKG8gZmreGnf5rQ5ho2VcGjMEEmCciwlkeqktqM/qDy7ObGTGah35Em6q6f6kbGOVMDYouuZXkOcSbRjpmNtWWCAXEzuyocCTi5NfDvqUl4YgmoT8okARBY+z70DxHg7ldPha32wR/PAg1xz72U= 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=Z6DB2YhG; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Cf8PPIxe; 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="Z6DB2YhG"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Cf8PPIxe" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60I7PKE01810398 for ; Sun, 18 Jan 2026 18:10:25 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= UER+4Rm+CTn1fc42ps9UZK/VrM2V9tBgnOrD2NvWQKQ=; b=Z6DB2YhGkaLCOu3G dvJzrF9MGYlT25uf4akGK2B2DlOvGRwGmJkrWOY3hzsMZ9UZKt9Edh/p9bkWGcRw ajdURbQ8XtREwXTXybLIEXImTWYYnGNwOm2JsNhQGOtXgrTJfP0JCqqeKjwLBLit VU7tDcy+orbSwYYr5ZET5qJ/GHTAYICe8F06wtnrAv9XQ+ZekQSdskicVPmsod1j jXwEuDZ/7cpau5lyz9sJ3ZCk1xTKJju3RqwxrwYerQtNGXL4GV9TsZEV2RI6HFgM vUIkGVwtgZpSNCspbZo8ypNikiv8lENoW2W9dQ0qDWgj4faSZJsRXaFDd7Up2NXc o7I//w== 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 4br2t72r4g-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 18 Jan 2026 18:10:25 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8c2a3a614b5so913548785a.0 for ; Sun, 18 Jan 2026 10:10:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768759825; x=1769364625; 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=UER+4Rm+CTn1fc42ps9UZK/VrM2V9tBgnOrD2NvWQKQ=; b=Cf8PPIxe3QExB3ydmvkmtzwX3c6mpxzPB+OIl7jplg3oo5NJraNV2fGtDl+17R2L9y rNq2jm0oE6MPZhf9wXWhyQCiMUvn+3ZHzm+7WuGD2y8xBr16e3I4AhN2hFkAWr1K8yG5 f2lD1EYtx7MlY5A0Prv/fzJpj8tE/7h3XfgzBSQxXbJqct6/oHUCb5Tw3C28b1wI6Cwc RN6864dmcIYkKJ9agN4jwQwdLRn2e3M9z279q1L1NSCRA3kA9Y5xOYJX2J9v5aHJ4gVY 0yHA+FSLEHDifs5joE5+GMmnIX8ZhaHBbzgkCbAPUiw2NoI838eAHGvfk+6AJWfICAO6 8lUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768759825; x=1769364625; 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=UER+4Rm+CTn1fc42ps9UZK/VrM2V9tBgnOrD2NvWQKQ=; b=snU/pJJ1JK2VfzlPgKtYOGccgV8Kcix1DHtNHXsciZYUJSr67W8aU51BOrSrtm1Bnz JmuR2YwqTD7ceVJNnBcHkC8FLvsg6vvyuKFhDs4S/Zdl2/enBv0Q7urE2Dw+FWofED8l rt+ly9wNsznTSzvdI1ePqQciK+NbVyf/46NiU61UpJIhNXTstf1fKNw8ruAsWd1RTdkv phPCrzfWR2aQsfIEBQsGCQ/7jUS0OC9wp5WCI2wFzFOhJxt4JqWsql1ZyNBce41pBc8/ KjkfkpAWvzLRAYaoviEtReQn1L/2QCzDvrzlSVYj4tK9P2UqLTIB7gqPk5iUhrmj8naq 3CzA== X-Forwarded-Encrypted: i=1; AJvYcCWrUAXHJdu+37L3m284++LxjcYTVPYvftsMFss2uWl6POQz9Vf63MIhxtNi7RHEu/9ZqQ/Xyn8MEUbmE3E=@vger.kernel.org X-Gm-Message-State: AOJu0YxrEuVBpKX2E2so2OIltv7MwuTdBUEGW0bPfjb0gB2PSmT273IM jj5P2ZGOcHO3dWpXvf2FD6Gn1M6ocAytSkQ3O0rT9ecRFzNjERP5lusocxc2z1joE+Xw/+EIGPl kOX7lejdGUnXa3HSRK3tNbU2ni9xA9FM0peAp2eFXgFjNiV4KusJqr84tDLZ1B3jkh0Y= X-Gm-Gg: AY/fxX4E596tmlYLQl0718rpMsnSu7ozQFJKzmHjnPvsaUrXja70TQ+ICIVULvFCHXa GBkF4uyMltoIqZcW3prxIc4xqqlAr3NslvhlK5ooAhAgT+8kmtxISg37t2d4Z0Sy2zk5sW7iLxY qukWWaSyS+O0ovx7vpnOVLEUwfwWchS5n9TVfWMqd9s3Oo9IoQ5d8CnaHCQSK2MDLiwBMtu/qs6 7aTUn9KMa1/KIdD4IN7sYdKiUrpo6775vzZH7yzGpIZCT5/N8GapYMflPXuc0wVKnOIibpH5rB0 tO9ZdI++2Bx7yzWksL3ganLiuwJLy7Ztpx8rA+OfkJcxYVlE7+ZIE0pnotyYIKU3avWnUmi8czp b94SYNJcpCpZDNyFBzHglQg9jc4gXkQ2+iQ== X-Received: by 2002:a05:620a:31a4:b0:8c5:3412:3aa6 with SMTP id af79cd13be357-8c591a1d06cmr1679914785a.42.1768759825062; Sun, 18 Jan 2026 10:10:25 -0800 (PST) X-Received: by 2002:a05:620a:31a4:b0:8c5:3412:3aa6 with SMTP id af79cd13be357-8c591a1d06cmr1679909785a.42.1768759824643; Sun, 18 Jan 2026 10:10:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 10:10:24 -0800 (PST) From: Krzysztof Kozlowski Date: Sun, 18 Jan 2026 19:09:33 +0100 Subject: [PATCH v2 10/11] pinctrl: rockchip: Simplify locking with scoped_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-10-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=1372; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=xHpKv/L+LPsJ9X96+TG0TkMyLzJ8lmjqPrbjckpJnLU=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpbSH2V7HCVVZQA8nE36OlRFJLPIeFm2jrQH0SA voGEok2auGJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaW0h9gAKCRDBN2bmhouD 138DD/9yYDuntgcWTSxWPvfXFutn8XLNtbjiww7N0//+LCDsOtjjM92dz6ezguNQS/QHM98IHRr SF6pn5H3zt8atlHdhCPpyf3x3oKRSwOS0Akm92SgBtUpRXGuMiq+7O2MsLdR/tIUF6gTEgn6yFV 84Lk5zDvgwOi0QlMHAVQZPovb6h/vY837EVCDSRCFQDUTEAR7na7JozMG8tp0VE0mE7bIWwPT/f v6lwP4dm5xYRh+B6HzZmHXrpwVUi9RbgeRK/PNZNadB3uz62KT1T0IT8R9nZUQtX9G4FMRwD3xH P5t30O/Hz6it1xvrvw1Lu5f3+AySnjjr6MZxix/zVD9DGKJE40H8HH7zTSSsREL4FwUU8zZS7HX dALPTXy6us1q2unNwiDi6kI/AVXWCCZ6sGl+XxvmbSBYYbIWREh+WyDt22jBLH1KeIKQYb7jH64 SyxqJFMRWZNJsMGxf5H4BjA+NqW9skDWnXCNH2FnpIxnCtdb32i8yyU24YQcB2qy+UqVOj/UGme M5VDHJie/HU+5EggRTKsw7A3HWxLO/5lpq8m0Aym+vl3+6ldnGSTLTfSdS07z4/0Eibgnw8tPUH +vVzE2zpO63gAjhez3qAdbhnW2A7TSbUiCJyYbYcgetBXMa20Xnn0pQEThXHPYBZKIK1KuGnnf6 /vUyVHqLHNNxN8A== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Authority-Analysis: v=2.4 cv=Fdc6BZ+6 c=1 sm=1 tr=0 ts=696d2211 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=zo1y7j5tH0XFdPBYKCAA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: -yU8XuZAwzlPjPoO8MUx9zv6jB61-lIX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE4MDE1OSBTYWx0ZWRfXwp+b+HIjh1bU Ge+SjBCWA/6JzkAigASFVjO8/jegdVocahofEhZODzK+8MWvZt9PSFmelIiIiRMEoPPa0VboWpv l6exsLO0tl4DeXI5Vj86BAixT0wewrzOd/3z5kh3xOOH9df8mmzNLiT1L6SOJQzPe4UD/mxLBXS S8nvEpu1qBe4XHCvnD0fLjs1dkt6SJ4+kwSisnZgYcyD/qhX+VkXv2Ew3kqO3E9cV9uAUFcZY1P Sos6vvlMorZtzYpC9JP12tjwHJPVnMnW47I+pOxddmhZNSWYA3Oig65LY/JKmwxSR2xSG84TWoa 21lOq5pZoCg+TdQ8Xh0+bAYHSJnNECCeevxV40IWH41SrbmQinL3hA9pqkSnsXoqzEj0in1oZdm Db5+Uyt0AP5VIZe3lI690/MEZqlRZd+FgEFpgQT2EkA0tellaDv5Pu/ETNvMQQN7Q0+3S2AnEdl 09Ua4xDB05iPjxlRMLA== X-Proofpoint-GUID: -yU8XuZAwzlPjPoO8MUx9zv6jB61-lIX 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 adultscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 suspectscore=0 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 by removing two mutex_unlock() calls with scoped_guard(). Reviewed-by: Heiko Stuebner Signed-off-by: Krzysztof Kozlowski --- 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-r= ockchip.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 =3D 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 =3D rockchip_pinconf_defer_pin(bank, + pin - bank->pin_base, + param, arg); + if (rc) + return rc; + break; + } } - mutex_unlock(&bank->deferred_lock); } =20 switch (param) { --=20 2.51.0