From mboxrd@z Thu Jan 1 00:00:00 1970 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 C08A936165C for ; Mon, 23 Feb 2026 10:06:46 +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=1771841208; cv=none; b=joPHzFCEAMHf+SLFfGrMsdSPAfXWkIggIpHDZDvkCDXBi9MM4I3uPP3XxlUXRT2Pa8kY2Y62p/24Xq1RMvDinHZTYWPUO1gLrInJjwHWpdOAzjzSZ5oBlfYUkISLbK0dH8zj2ziX4ysSo1wCT2xVUsMkGKVY3okH7fNr3O9YwU0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771841208; c=relaxed/simple; bh=rx1gjosQF3AWAucT75rdoaKtpxg6brNRCssFxpxiEzQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kVbpsD8zzzVQR5X3Z4RwYn5al6dAuoIfJ+IPqmtq4MpyhJrozYouTfPNaExVv2hLulR5VRyhkhZ4fsUAR1a/Gx4ImlZzNSuTuFnCViHKDvW8CIbL8WjrEYz3o3MIFifXHgLLJof1sSKYsmY/XkeQIbRLdpHejgcVV7TGuGdSwAc= 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=NyO7Qvpa; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GCXK6I4B; 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="NyO7Qvpa"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GCXK6I4B" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61N8VaEF2887961 for ; Mon, 23 Feb 2026 10:06:45 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= JKNSNLs1nLw5vrqapKbsql7TyitUgYQa9wtkF8pESY0=; b=NyO7QvpaPcJay2bV BqL8bOP7flj5g6P3oC/Fcs737l/OBVMuJ1VGOr05lHgTt+dPVQfpBowS58f8TnXV +s0lvGNRxU3dPRtdH0DSEPfHnkprfWuiouKkEni2oCLQa48VG0yuhozYV8vHkfAg xuoqZWbZi99wwTx7Q1LBF5zrTR0ngfGi4guzipQbtGGr2tDqoSxRrn5uqQ3SYG1z OaohK030iloCb+22PDvYMB1ss8iUqneP2bM0d+VjXiwU5ltBKJD4S7QJwtPpu9X2 tO9iNL/Eti47XLgm4TrLg1PCSYlmy97ctolZMnwYQ7O7y92uM11/pmyj2nagqN0t sCnNDA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cf5u8m8mb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 23 Feb 2026 10:06:45 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8c71156fe09so3786196885a.0 for ; Mon, 23 Feb 2026 02:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1771841205; x=1772446005; 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=JKNSNLs1nLw5vrqapKbsql7TyitUgYQa9wtkF8pESY0=; b=GCXK6I4BLwRSGgz/DOb4KezOYfWKne/iI0iVKMoHuRW8SGl5TXZb7gusR6PXOIqsBz OMtANnYI5MJpzwwH6QiRZxrgIiVhgPGYM15BQKrDnFIPKc7BkgwiLJtAa+fWeCp480p7 E/SkNHX9KdXPrgq9iLbWRppDcR4XoWhOq934YubOp+gK9mdcUWGKv5d7Ka+taYDDZEIp KYYAy6nnfScOk7ojtyUvg/CCSdoQhtYF7km7xnsWJCjLRx3vYDHtN8xKfAfdAJ98Oh52 7erxPdgB2Mqyo+ggQ1Woqb4K011TyTgtwBDpVEauZn3lDoUDJ71X0CNmDK29yCpih3TS Al/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771841205; x=1772446005; 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=JKNSNLs1nLw5vrqapKbsql7TyitUgYQa9wtkF8pESY0=; b=ZWbakC6gUATAppmJ+Yp1K+BxsTovQMoes0TfbV/+s05w8zKlIk4xbgQlf/avjM+duD gNCpfHefjrzqvTZMj54JXf5DEyMmhSiJBpE/ZCg7Kc54vGUoyxXWuqs4c9HKGNSg9Iao NHqVGSHsXLwcQnjDvZNfIV/kKTiajHG234g1TCmd66naCPvcYBaMr2uz9Ul6B/77SvER ZZNIXtFq8YzBOuVST4pStI2B/mprOuh4bWwaIueu0zIWSWygTJNJUYghaBvDRG4WB2U9 clh+DJht6kAatg5zfOAL8QnuG1Vd9rslBFPCVqeTOPUN0t7RvtYf2xh0Az3HE/Loek1E xjlg== X-Gm-Message-State: AOJu0YxJW9cH1Vaua8eakjFHfYR+ZTmL4YKhogz41BpLzx0MHpY3qa4E M2O3pv5zD4WaSGgEKweZbv8jCywlzStSe/4qBCHz0TNaN+75xGqHo0XOPGG+Q+UFpjoZRtRnMoc NrqRhhN4ouscEmpyc9I0gB1dU5cnZeYAH6QcFJGMfU9CalT5d8i5Pv53BDGm85cOuZBo0pjYAl6 o= X-Gm-Gg: AZuq6aLiwPKR2fE3kLytqA1MwMuYXyvgPOfLFwo6AL+ytjZRAuoSot946Iv1NEqCSYm qgVVwJgpvXhysyZZec5mEn76vpXxKVkAwtLSFKJjUfR2e1pbHhOJhBJewCiKWhi9KZs537jX4iH Ca2BiXNX3ZvngQ0TzMS5QxNmI9Jry79I8sYh4zVRSFHhiH151zQIhMrgGeMiyF7yv8XHiCENuXB F/Hd1Yo/5NsQhB8WeGhrV5QfUEEECN4FsE07tBmeWSzWwjoYtpNK7tc/YWxHx4DTlRlY/AYJmho B9yYAkJafCw3TbwgwKbmm20jxVU6+ZFZIigSjDQnoP1fuo8WeKhNEL29A2eLitO3UyaUVoZfFFZ OrjHUw6J8Uw432cn45jjRVH2/fg68GUc1ErWstQ1xRBnVf06guFW3 X-Received: by 2002:a05:620a:d93:b0:8c6:e224:926d with SMTP id af79cd13be357-8cb8c9d1e53mr1029339385a.16.1771841204853; Mon, 23 Feb 2026 02:06:44 -0800 (PST) X-Received: by 2002:a05:620a:d93:b0:8c6:e224:926d with SMTP id af79cd13be357-8cb8c9d1e53mr1029336685a.16.1771841204341; Mon, 23 Feb 2026 02:06:44 -0800 (PST) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:bd71:422c:5e83:8b37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43970d54760sm18288885f8f.35.2026.02.23.02.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 02:06:43 -0800 (PST) From: Bartosz Golaszewski Date: Mon, 23 Feb 2026 11:06:20 +0100 Subject: [PATCH v2 07/14] reset: use lock guards in reset core 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: 7bit Message-Id: <20260223-reset-core-refactor-v2-7-5e5a7289190c@oss.qualcomm.com> References: <20260223-reset-core-refactor-v2-0-5e5a7289190c@oss.qualcomm.com> In-Reply-To: <20260223-reset-core-refactor-v2-0-5e5a7289190c@oss.qualcomm.com> To: Krzysztof Kozlowski , Philipp Zabel Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4808; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=rx1gjosQF3AWAucT75rdoaKtpxg6brNRCssFxpxiEzQ=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBpnCamPSjuFZM3+Kr5mFtfERPLPKE8o9ZA9v3d2 vycJSquuluJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCaZwmpgAKCRAFnS7L/zaE wy/5D/9TCrH17QnQAtSTezoV5Zwcnifsn82Hmo2IZyTyD2Zcu+uX9IZDwmTxd2F/KLUS+jJ5uC+ M9iweVSMQWlC0MdBImQ5nVd1/Bceh4TnLV5yUag+nkMWfabCKx4vXQzAHeId7tUXFaycMzafj0g TpPdtV7GNQbGtvDnWNCKoNz22QaoOomU+BK1kgapqfEkI8lIXE6mZ5vToSyAb1t73+02PwowwNo VbYVyJHRvlQyyIIuMslIMPGVG4tU7eum/STKGXcBm3FgzMpmoDUhT9dbrIXVLW/TTpmkdQiF/lA DpezLjz9i9MYAf0MUjOeRcvI8QfE1faSObu8Xpo5LVTKmtjlWfiSOvWYgVndUOnXrv9eju0KL/P sloZPo+h7fXsuYr1/oAFvHM8aM842kSAfS6i9BOhuskmp5gc2vn1B0IpVed4nxpIwYvyFUjumkH VcRQtboZcg9eBmP5Tohf6dAcCljX5sIHKNWgygLnvxsQZssTOofxL/nH78x38yG0CHDnRTNELoE Hk85Iqx03+XTN6U+qmskdMDGHr8k4Cynk6wbvs0mJeogC6MVyPaAf57g64ENkoSY6BqjQakr8es sRN1ReA/n5emSE/wq7i0Nva65Nk1TSW4TIkL21ltibsWqY96Nw/laG4jii4yOXxM5/JIwyo9xVU PF/dS3szhKILHEg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-GUID: fpS6onTQgzUILiHYWEsyVDCumu_8gz1S X-Authority-Analysis: v=2.4 cv=cJftc1eN c=1 sm=1 tr=0 ts=699c26b5 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=ABYPN_TNRu3JwaOvJ3UA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: fpS6onTQgzUILiHYWEsyVDCumu_8gz1S X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjIzMDA4NiBTYWx0ZWRfXwbLea5IFQq7x VBNy0s2JpHTjUXLE/2q2oS5pZcpqXXEHkMwFj5fuXhtegh0XiStMunsLlAx07WqD+KBBxLFBRBp L+62QE3IUzjBOekcBH6auXFR9dN6yfnctK5vfdnL39oKbaYoNAuzI4RERG7abQeqOkDtO1qF2Wq JA3p+No3ErbznYTgorka1qFZL4bfN0ZZqE3PvEgbN6DKf8vFCI37xH9wgpEtchKek7y5zbXybzo SYkYCnhPa1USrshMu4GTRuC5I2vDsenVJ87mTIBTGX4trcu07mRc9lbGyo/AB3KUcFAMGGm9Wcz C4ka/qWGEIuj5aaudTE+sTvLdhWXnNwJFTKmUGywlEWtjzM7aquq53RxDfq8Ae3liuQRMxgSPNy nchmLJJbfVn66XROkq31k6xN1S84Sjw93lJXWEIbOM1HZcVgHQuOI+ZYNc8CZG+UHchpQQ8v+vs 48WQpzMjUGwWOAX3ReA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-23_02,2026-02-20_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 clxscore=1015 malwarescore=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 impostorscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602230086 Simplify the locking code in reset core by using lock guard from linux/cleanup.h. Signed-off-by: Bartosz Golaszewski --- drivers/reset/core.c | 55 ++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 025004989595ac60381804a7705a1eb584b63326..9fef9f972e93fb7388f27ac3bbdf68c884b72ff5 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -129,9 +129,9 @@ int reset_controller_register(struct reset_controller_dev *rcdev) INIT_LIST_HEAD(&rcdev->reset_control_head); - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + list_add(&rcdev->list, &reset_controller_list); - mutex_unlock(&reset_list_mutex); return 0; } @@ -143,9 +143,9 @@ EXPORT_SYMBOL_GPL(reset_controller_register); */ void reset_controller_unregister(struct reset_controller_dev *rcdev) { - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + list_del(&rcdev->list); - mutex_unlock(&reset_list_mutex); } EXPORT_SYMBOL_GPL(reset_controller_unregister); @@ -646,25 +646,20 @@ int reset_control_acquire(struct reset_control *rstc) if (reset_control_is_array(rstc)) return reset_control_array_acquire(rstc_to_array(rstc)); - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); - if (rstc->acquired) { - mutex_unlock(&reset_list_mutex); + if (rstc->acquired) return 0; - } list_for_each_entry(rc, &rstc->rcdev->reset_control_head, list) { if (rstc != rc && rstc->id == rc->id) { - if (rc->acquired) { - mutex_unlock(&reset_list_mutex); + if (rc->acquired) return -EBUSY; - } } } rstc->acquired = true; - mutex_unlock(&reset_list_mutex); return 0; } EXPORT_SYMBOL_GPL(reset_control_acquire); @@ -1064,27 +1059,28 @@ __of_reset_control_get(struct device_node *node, const char *id, int index, ret = __reset_add_reset_gpio_device(node, &args); if (ret) { - rstc = ERR_PTR(ret); - goto out_put; + of_node_put(args.np); + return ERR_PTR(ret); } } - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + rcdev = __reset_find_rcdev(&args, gpio_fallback); if (!rcdev) { rstc = ERR_PTR(-EPROBE_DEFER); - goto out_unlock; + goto out_put; } if (WARN_ON(args.args_count != rcdev->of_reset_n_cells)) { rstc = ERR_PTR(-EINVAL); - goto out_unlock; + goto out_put; } rstc_id = rcdev->of_xlate(rcdev, &args); if (rstc_id < 0) { rstc = ERR_PTR(rstc_id); - goto out_unlock; + goto out_put; } flags &= ~RESET_CONTROL_FLAGS_BIT_OPTIONAL; @@ -1092,8 +1088,6 @@ __of_reset_control_get(struct device_node *node, const char *id, int index, /* reset_list_mutex also protects the rcdev's reset_control list */ rstc = __reset_control_get_internal(rcdev, rstc_id, flags); -out_unlock: - mutex_unlock(&reset_list_mutex); out_put: of_node_put(args.np); @@ -1135,10 +1129,11 @@ int __reset_control_bulk_get(struct device *dev, int num_rstcs, return 0; err: - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + while (i--) __reset_control_put_internal(rstcs[i].rstc); - mutex_unlock(&reset_list_mutex); + return ret; } EXPORT_SYMBOL_GPL(__reset_control_bulk_get); @@ -1147,10 +1142,10 @@ static void reset_control_array_put(struct reset_control_array *resets) { int i; - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + for (i = 0; i < resets->num_rstcs; i++) __reset_control_put_internal(resets->rstc[i]); - mutex_unlock(&reset_list_mutex); kfree(resets); } @@ -1168,9 +1163,9 @@ void reset_control_put(struct reset_control *rstc) return; } - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + __reset_control_put_internal(rstc); - mutex_unlock(&reset_list_mutex); } EXPORT_SYMBOL_GPL(reset_control_put); @@ -1181,10 +1176,10 @@ EXPORT_SYMBOL_GPL(reset_control_put); */ void reset_control_bulk_put(int num_rstcs, struct reset_control_bulk_data *rstcs) { - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + while (num_rstcs--) __reset_control_put_internal(rstcs[num_rstcs].rstc); - mutex_unlock(&reset_list_mutex); } EXPORT_SYMBOL_GPL(reset_control_bulk_put); @@ -1403,10 +1398,10 @@ of_reset_control_array_get(struct device_node *np, enum reset_control_flags flag return &resets->base; err_rst: - mutex_lock(&reset_list_mutex); + guard(mutex)(&reset_list_mutex); + while (--i >= 0) __reset_control_put_internal(resets->rstc[i]); - mutex_unlock(&reset_list_mutex); kfree(resets); -- 2.47.3