From nobody Mon Feb 9 09:43:26 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 9478C23EA81 for ; Sun, 18 Jan 2026 18:10:24 +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=1768759826; cv=none; b=uH5W09mtbf041yKzH0+yVzZ0JKLVSgX0+UckBtt8jACZRddLB57PkMwhD8jiVs3Uh8dFovHmJf0e7UzD8yTx/eCd0vwGlp4w7nYmiD/41WC4bi/immuWYnUEhBaLq6d610Snz1avVN7Z/2WD4piPT93200OuOJrVMTy/fLHv/pA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768759826; c=relaxed/simple; bh=FLZSR96VBkRrzhSP3/2OgTuUg9DxmOscsEadYFKjqPY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jHEnWxq3UY1tANvtjYZnuPmQdmsTlq/Z9nWCrZfHXmuYBqN75pUj4NyJhvdvUVYRmyzddGiE6iTgv9bLs117KXiIlOmerOHlcIytW3dE8y3IRLbbP7rJwcsErhUjOWvbG1lgKSiLZ4YlpyEIClhYUvJfKq6jsFTzrMuafP9/Zm4= 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=oRpcLxOS; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=UNr9ICmN; 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="oRpcLxOS"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="UNr9ICmN" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60IEavF9219372 for ; Sun, 18 Jan 2026 18:10:23 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= RvEwfJnzPB9SKmFVJEQfF/6xbtK/stkjY8FP5vkfIg8=; b=oRpcLxOSIgnQcj/G yg8Hyar8Un3q7Ovi/gBJnj3R+oluHlUQFC1DHjF2h+VTk000kvwcmxlLWX/zOVUh w9fRrrwLuCluyalYVdPb3sZJZpCc/r/UNmi6zxL129lxgfQnpDDPVroP9f/ethIv c70ogb4hngTCCYaYJiWKzGJZLPlO4m8JtHNoJSa1MkMfEu7IoaWDAtkf6sJGjaRA ZsHfxqXTxLw9yGMPfIhg8nSFt/MiFAFZ+zVDeEuz121NLy0+IiSSFsIOgTKm5U4b S1oRRECpIpwXLg7Zc4h059rZyp9AmllxgFuqiGNWeKo/C6u4MPf7QevOiUl755ST oqvn7Q== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4br36dars7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 18 Jan 2026 18:10:23 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8c52c921886so479321785a.2 for ; Sun, 18 Jan 2026 10:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768759822; x=1769364622; 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=RvEwfJnzPB9SKmFVJEQfF/6xbtK/stkjY8FP5vkfIg8=; b=UNr9ICmN/MxFBIybOtTRo3IjX+44iUMXqIzx9UOXBgJO6mHNDPlk3HcLt95rruKkXN Yw79/kUFACRwlVyN9L4Z2W+P5Z7ph7V8aEM/bPyiKrYHDxi+VzpeiUJGjusq4JFbUa4c /Wbz9ipWF1M58CkzxF0MlLamsGjWm0BLASKpBd9/SobLaOL52YmaG9A0WR20BK0kR4Q2 xIPt1QAp6cwpyU5EqM7ZKEGxc7p4O6OxrNYS6VlQe2tCA4fRh4xc/Oxh70TjnGgzwnfT DzT3x2ye1mFSELo4xYlNmitr3vkbfHpjz46y0KnifiZ6J360nTj8vFAkrDz0A/c4hpGP YQuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768759822; x=1769364622; 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=RvEwfJnzPB9SKmFVJEQfF/6xbtK/stkjY8FP5vkfIg8=; b=K55zKhA7aqcQtsH0nKMdl8vkyCCg9elaypOxTjEHh/2euTZKOIp8rBEEXLyTd0I+zI A0Ly8YIBS6MLu7AynqSNjw3LmmYeEbG2fq2ONEeNy0lVsDqBRqsgH2M5Do28v5fPQDom rjgYKjK9XEDMJIHrmPKrBYZjJwzl/1j6SPOEwih6VKBUI9uedkuv7du6mtDIZLsu603U eYpZWyI7uK82hWzc3oAz6Z1p4F2MrkvxFNNUqnuHMQOBeZP+Wc19srfcXn9TnhVTJU3L 6qIDz3vbptke+TEweQ3jCEBzgfuoSmrLXcxm/139g7lJY9u4Bpi6PT62COjH5JtCjWFM mDpA== X-Forwarded-Encrypted: i=1; AJvYcCUNZROFPf6Lh/4jJ0bgDThpkUYIb9gkLaLIkGjEs9Edr1Ue0F7PF0ba4TghoUvlubH2VGoZSHH/nidHFs8=@vger.kernel.org X-Gm-Message-State: AOJu0YxBbuRg+w5tIQdlQqqiOerVy7s3nfBH461GD9JI+/RNND1cJrtU WO6IxzdBAl7g19wmqHV0JD5zT8jSjDqfT5e4t+YxWkqwNkwoYytSNffmC8tiEBEG8xszP3uky7P qCiVJh5H6MU/ZxCPcL8WVf1wnATSnZD6S1TArVN408cLG3qEIFZfnUiY4xR/xNc4cwk8= X-Gm-Gg: AY/fxX6QKpMnWngkt5NdamUxkPwBOUbsQUBEb8wEKICTQXH6uTJRjJ7NzJ/0wqN7Joq mDufkcRy7KXPdZkxK9CU6JI2N6Yamjkai6uxZ4WX6mPSwZisH0yyLu40nBK9H/zrEAXsLtZCq3G BUaNvUx65IPisdY9luwicaGh9eoGNVTYRt02VwevxbNNl//+Z0iVQY673q63UjAed1OZTJZcObh TjwrU047ohpLycszpWZ5uw4f9OBAmqpCYZT26EqYV7saU15KekDKTslfjAKayPnIWGlI1iI2rkP EcAIhPQ/s7+UgYrWY/GP1xRyYfe+HJvLdiTvPS1a/MwCHq9qlWKebn9i78RIV1Zix+wYpBPDzlv GhCSCxSdnXZ0WiXGLewFDzkC2C/dltAcZvQ== X-Received: by 2002:a05:620a:1a8b:b0:8c6:b315:1452 with SMTP id af79cd13be357-8c6b315184fmr728108885a.7.1768759822580; Sun, 18 Jan 2026 10:10:22 -0800 (PST) X-Received: by 2002:a05:620a:1a8b:b0:8c6:b315:1452 with SMTP id af79cd13be357-8c6b315184fmr728105485a.7.1768759822113; Sun, 18 Jan 2026 10:10:22 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 10:10:21 -0800 (PST) From: Krzysztof Kozlowski Date: Sun, 18 Jan 2026 19:09:32 +0100 Subject: [PATCH v2 09/11] pinctrl: tegra-xusb: 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-9-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=2035; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=FLZSR96VBkRrzhSP3/2OgTuUg9DxmOscsEadYFKjqPY=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpbSH12QqDR9lyHrdfWBYKu5wDAWLJ9ZakzQ3LT 0UuYPASn5+JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaW0h9QAKCRDBN2bmhouD 12VHD/9unxdOGDL9Cvw8qMe+777M4gAqFDHe661yf+QCRAMfaXbN3WSV5wByRbqTx3YfWy21YOQ PmUn8RHfADZRESRLJ40apeyBHwmf+X3aiVzCvJrIhssAEg8e6K7zet9KS39Wxq+ggSw4RMklgwR 648adqt9vMbooDA18DkIXowYvJNwPJKcEnez2js1gOhYtk9Et0iy/q7sWb1Pdi265zTYwxv9fSN 1XA2P6oDR2vvTZGfRM3Y3qL9sYGLOq+7J9B2IhXGsT4h0bakUH/HwP+otw1LPAta+OerExiolHI mYexTPNF9qC1iJTWw9c0TKj9KMWD6/7qUHNH6Na0WwHWYNyqKi68kjfdg8ye2KAuFsHc4AFBrlg D4+GUG4Z5YjPvImtD+ZxD49iaeWlpHrIs9/oPs8qcDvb4tIp237aGABh+JBRAXZIneYCMNNZaT1 StSPdDt7VhSHoNzlof1zSlpuaWaw1Pabz/Tr+4F1xEqFkZZFTdO26JMZcQMyZox72x7c/QHRR5A +YvVe+Z5+GsaGQttt1PTi5ccnDiKJoTagTW/dEGBAtL7aTvBTSan7k10tRuwFKj8ZWVzxHG4TSI Uw+E/NGfkjEagoYcsHuN9QA27EJwqMeW9WQTpq7JAAHx4NjypWFW+haLBXvrjgznmhZ8d0reg6W wSCbjewNTPr6JfA== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE4MDE2MCBTYWx0ZWRfXxjRQgQDt4n0S Fy/Uau2H7OsWr/i0+C/WoGLY++1xnbwXXE1jYsB6yVfdRwGWisiBh57PIIonNtlbQ3TMpKV2qya xXouvg1P0963H72OPAysLArwpfly0eAsVjrjSIHG2UB+HjicC8Ztzkz3D/JZlfRL1KFI/fyjjP3 8koDrrbSK70NhFfSaZc9E7dFasUQ+MCqIxxNuWOGoxjzF6L7/9NqutAnwRq7C9m0rNeGq0BF5aD RrHdtUA+oXU2ZYvgwOrf4gb5+E6eE2LGlDPSUVN2KqcvT/7LfJNpFrWoNgEh+bseFxr88/Le4/S QD78xdJcZkhWzs/r6L+tUgU0hFhSSmL3xXSFJGXvzTaALBvk3MrOMdnQALF9xBf3NlxS/k8XH+y iPPy/aK5zQjHNJHJdEhVo4Nawh9HdraSJp6mQcevOyvkgT7nLUZ+huSC6JXrGQw7W3dvU/Sx+rG 6lsjO7/WZvNXulF26wQ== X-Proofpoint-GUID: 9lnp4Ys061CtGQmzIvfsY__B9qRP0TFT X-Authority-Analysis: v=2.4 cv=GJ0F0+NK c=1 sm=1 tr=0 ts=696d220f cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=Eb9f15NH/cHKzfGOmZSO4Q==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=aRO1tsgHJH1V1zxVpf4A:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: 9lnp4Ys061CtGQmzIvfsY__B9qRP0TFT 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 priorityscore=1501 malwarescore=0 spamscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601180160 Simplify error handling (less gotos) over locks with guard(). Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Drop stale mutex_unlock (Jon) --- drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c b/drivers/pinctrl/t= egra/pinctrl-tegra-xusb.c index 34a373f7e04d..c6a51bb21215 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra-xusb.c @@ -478,10 +478,10 @@ static void tegra_xusb_padctl_enable(struct tegra_xus= b_padctl *padctl) { u32 value; =20 - mutex_lock(&padctl->lock); + guard(mutex)(&padctl->lock); =20 if (padctl->enable++ > 0) - goto out; + return; =20 value =3D padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM); value &=3D ~XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_CLAMP_EN; @@ -498,22 +498,19 @@ static void tegra_xusb_padctl_enable(struct tegra_xus= b_padctl *padctl) value =3D padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM); value &=3D ~XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN; padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM); - -out: - mutex_unlock(&padctl->lock); } =20 static void tegra_xusb_padctl_disable(struct tegra_xusb_padctl *padctl) { u32 value; =20 - mutex_lock(&padctl->lock); + guard(mutex)(&padctl->lock); =20 if (WARN_ON(padctl->enable =3D=3D 0)) - goto out; + return; =20 if (--padctl->enable > 0) - goto out; + return; =20 value =3D padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM); value |=3D XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_VCORE_DOWN; @@ -530,9 +527,6 @@ static void tegra_xusb_padctl_disable(struct tegra_xusb= _padctl *padctl) value =3D padctl_readl(padctl, XUSB_PADCTL_ELPG_PROGRAM); value |=3D XUSB_PADCTL_ELPG_PROGRAM_AUX_MUX_LP0_CLAMP_EN; padctl_writel(padctl, value, XUSB_PADCTL_ELPG_PROGRAM); - -out: - mutex_unlock(&padctl->lock); } =20 static int tegra_xusb_phy_init(struct phy *phy) --=20 2.51.0