From nobody Tue Feb 10 10:54:49 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 418803659FB for ; Fri, 9 Jan 2026 16:58:27 +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=1767977910; cv=none; b=KNeTYBPMnq332JQr84zVoqZP6gaG3NQhFKSuHDiDEZtYXEKXg2VOVHnBn+pj9YqFIQkhH8Xm0bDwJpjXiz0rlNB8P/Yfh1KeeNw9Us/kXhukZlINzNwAV4hX1kaEwQm7WPQ+IXLhnHyTcyuNgdTxc0sH+EWNkDUTIAxMYu+KUYY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767977910; c=relaxed/simple; bh=X+rJqgWZb7AzM0cu+pmQcyBAFnuuYCBdFr+ESsAnRIM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EH6OdZhjoNLhlzuTX3EcuiD7S2CvzA3dlkxENirzD3gxwZYziRZNqK6qVO6arqOBcrjll/fLmRKrRZq5Wlcans0io+WDxsUfFKq/IoL9uk+ywa7C767lR5VTIePyVyQdFHrFxcyrMFyLlL+W/xmpylNTge3m0BQkNNW7Frtlfjg= 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=HLLk73qH; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ayg8v68e; 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="HLLk73qH"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ayg8v68e" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 609B2oqW1062645 for ; Fri, 9 Jan 2026 16:58:26 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= pS94iKUZ1ZfNhKbyBy+xUgSm1zdImwT1//knkyqK6zM=; b=HLLk73qHKf0AEcm3 ZjzclVmLeQ0/Ah6IGmE38mGb8WeT7jkmCfgh3Qhq7o7iAMC9TMWTvb/v3TfrkoWm rTJHj7cFsKnO7AOfejr9gYB4KoyZh8Q8/AP83uWDcREQRbmXggFdKDH7zHksGjIY +346youzmL0/w61L1v0BhkvOYwxSoMWwS6zZvE7WA5o8HqVR0ADPaoutLXKO6Qdg cnWCF72VIPRVdRwKLf6roz8zagjxDXW0ilwhrt0cEhupDMoPd9gEEZnmVLYOqHmH sNtKvWEEP3xrXM37MwdtQRa0KoAjjtzu+dk6iIKy2JqYcShpU4Bqo4/T0xw8AQHE RMWEJw== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bk0f690b6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 09 Jan 2026 16:58:26 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8c2a3a614b5so921455285a.0 for ; Fri, 09 Jan 2026 08:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767977906; x=1768582706; 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=pS94iKUZ1ZfNhKbyBy+xUgSm1zdImwT1//knkyqK6zM=; b=Ayg8v68e4CM7+wiooAPxaVFiEGgHSKVGDz7PAuVJKMWLPVqLDHH2FfuH1RvSYg+vZQ 1z3UnGYA6ZzlH1rzWsvHhdCch6BtnJxKiqrYkjMcxj+mqXk/qQpJeVErZf7dZNJROX9O 0wbN3H2GmxPm3Dud1TI9vzpXsFyOd9h7sfemDe4t6vgFeBNsLXR7wDnLWGke5IIu2pEB +J3G8JciPhTNDFsA9xkdronJVA0dFXCOLbCdvOzp8RHDe+aMVfgjErAjwKl82BD4dlje Bb40idYHwBN3m1+T1PmRMhw9HWIcpE0euqhGgv37nl6L+Q6teRzuqgc6F2fFDcvBl78U YPNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767977906; x=1768582706; 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=pS94iKUZ1ZfNhKbyBy+xUgSm1zdImwT1//knkyqK6zM=; b=nGIKz9asAYkK2ALcXJZ/Z/QlANU83nGXnYMFOFbBjGngDf68/AZ2sRk7SuZiL0t3eR a8fhW1YNIjcyQHMhYcGDGfDXa8rWj2saR1au0XDFLxJYKTg3/cMedZmOnig8/cBbejrH e2B11wl+eaPfG0LR4hK8dH0HC9R7C4U6Jzc7uQ4bR9XB1cWBtwk9sRGaigzFYbWGzaFD CFPvcl0sGJE5zI1qgtllRrltDyHgR8gJbUiH8FrmXCjVoS1EKVAMQ5mNyayKl+TpOL5K AkGWojSTrfUY2eAouEBEi+5zriD7XMmIEUcH48BQeorNk4gF3heUU7qm6oVnw5J7dWVV py8Q== X-Gm-Message-State: AOJu0Yxb3T4GW6Azf+Oje5kV0KnqbUAnG6MkaeYIjUsawNqDNK/+MzBD RFx4dzq8c+qwHNxFscMfSv/Qq15erS2Z4+WYs8KOUuQOIAivbVp9FtnAbwr4nPWNBiZcT1hE+z1 2K7PRgk4RUfCQq2FyQaI+SBPfzbww6fgSFEpRL87juzjdALx/DgippWpTKFrvgz0Lt8E= X-Gm-Gg: AY/fxX4s/XXef+8M2iJa4IU30eBif49t+p9jI0qCoiUZzzhT6UiO9LG8E82PtDNVYY9 9zkzYm8CzP5OpH6SCC8oWP1Sa7saukpFRB5CCs69Ec/hWynbbdOwBqBBD8yHZNyCE37UFkrIUI2 qD7JgCGM7GPFGckpLRiRVdZfn9It6joFcvCR7Zl0RvRHIqa9vYDYLy3q8rskpD1K7/hX6Hvwm1L 92gPtlWH73RFYoR5xvUTUEhjqiDzIFct1Pz0PBydNXiu4Z3VdFVKVUtnb6AsckAypel9T/dKN+k /YRa554mDVMgyr7OxpeLrTySv7QF8VnUakb8DOYMeXe+5rYfxc4v8EAu5tzKB4b+wZ9gP0rVssZ Hylkg+rxEjnj0ZRcGStc8/WZRYq2WqKFXsQ== X-Received: by 2002:a05:620a:4508:b0:8b2:e3c1:24b7 with SMTP id af79cd13be357-8c37f535f19mr1820071085a.29.1767977905734; Fri, 09 Jan 2026 08:58:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsfjFGqbAxLc23gcdJYsriEigu5ohevlkCtmB7A0Yd5kZaYg4F8i/gp5IEYHwuSzY4tC8AiA== X-Received: by 2002:a05:620a:4508:b0:8b2:e3c1:24b7 with SMTP id af79cd13be357-8c37f535f19mr1820067085a.29.1767977905236; Fri, 09 Jan 2026 08:58:25 -0800 (PST) Received: from [127.0.1.1] ([178.197.218.229]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432bd5ee243sm23231784f8f.31.2026.01.09.08.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 08:58:24 -0800 (PST) From: Krzysztof Kozlowski Date: Fri, 09 Jan 2026 17:57:51 +0100 Subject: [PATCH v3 07/12] cdx: Use mutex guard to simplify error handling 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: <20260109-of-for-each-compatible-scoped-v3-7-c22fa2c0749a@oss.qualcomm.com> References: <20260109-of-for-each-compatible-scoped-v3-0-c22fa2c0749a@oss.qualcomm.com> In-Reply-To: <20260109-of-for-each-compatible-scoped-v3-0-c22fa2c0749a@oss.qualcomm.com> To: Miguel Ojeda , Rob Herring , Saravana Kannan , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Russell King , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Krzysztof Kozlowski , Alim Akhtar , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Nipun Gupta , Nikhil Agarwal , Abel Vesa , Peng Fan , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Vinod Koul , Sylwester Nawrocki , Mauro Carvalho Chehab , "Rafael J. Wysocki" , Viresh Kumar Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-clk@vger.kernel.org, imx@lists.linux.dev, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-pm@vger.kernel.org, Jonathan Cameron , Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1439; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=X+rJqgWZb7AzM0cu+pmQcyBAFnuuYCBdFr+ESsAnRIM=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpYTOWTG2xT0pRpBkG2Oxza7snBRuC4VjYU3M/U qAWA101mfyJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaWEzlgAKCRDBN2bmhouD 1z25D/43t1RnWOYzf6VK4emya2IvUXE4PE2KamRZbdrtRYUt33wpN5FW/mIaskpIim+yLl4Mz57 Q99PnqT67OgRKNWb5vmCgdvzae2SWBlxdKcnNPQnlosJLQrzfUCiZ0JDB1SUJRi7Gkkt2EYH1FR ABmiT4JE4sfEYLpZYwp0xtuNfjNRa3KTkJMP5pE3gHAfHHfmLaw0FImBWZKPPa3vPfJ9G7c0WtP i68ZQ7BIm5bYdiwMB3H6oYmovINgnOafL8vV1vuCxpCEg2a4L931KEMc+hmHQE4vPjpr5MoZOV1 6NrLnPJTqdu1x0qXBS0iyPV5wNigBxrB23X+AAecmDUiNNDKSRa432oGjKMxmqRcVlyehngW8qv kryEBlWuLwaUiwOBxco/J6hgP6KeFL10P9udg8CAfutYUMxVAoU3ZDhNEZjIzZ7B+TR5yUjG3Am kKEusMDjK0bNXrAVkFkmYgSddWZK9KeNtqGe1jaKsr/WnyFFbNIyY3FjjqitFE6wg3fZSGLnnPM HluYuCBYQrTbNLEw021XbRsgnYSjh2j3tHlJWE8ajcwk8qzdhuugpcOFQ6ADF70mVzyRdFMSIbL YMdfyfOEGuzc1cFMbv7kIwtnmyv5mpgwGMlBRVfqlb8udSpwuJ09qezcbQ169bmtQve+3z3ZGHc gkOPygD7XBxOF/A== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Authority-Analysis: v=2.4 cv=P803RyAu c=1 sm=1 tr=0 ts=696133b2 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=Eb9f15NH/cHKzfGOmZSO4Q==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=i0EeH86SAAAA:8 a=EUspDBNiAAAA:8 a=HFiHojuE27rTourpOroA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTA5MDEyOCBTYWx0ZWRfX2sK2mS9GCHgd TY2Uuw+reSlcdJVr+YnADZZUroPfOq8OU9YOagE8qg521OtQMzBaVj9IYmPC5Hfbl3caab7kWak mTHSvWyfMMN8iQ0RGV5RQTvHhvPqObvoOUXpBzeCFXGNmsku5LFQD20ztRQ0ll+a+J744ltJVkp uBiEyZxfRtxH2uZ3EY9xyIS1bDZLrvKuIVVehYjdb0Ahg/atB9twiBfYgZdQ+WDOVZMWhka097i 9Hq9SEU8b1QODk3ewwPm30s9tvP8tjm/oHllx4431kTWilt7FxQ54FH4bFzIvNfrlVwpr8DVV1K lcHuOn0CZzmC0usFN1Mn8lMAB95aH1roqvf+3ME8cwbAEN+YmSzPAgw9/YOGU/be8+ZqImiUpRe BvlQPcoTNzhtDNPztMsDHeQYmGpBaBKXEVUlWgj7HFI+Ee97DHGNoH/yI+JHY1NiODSi7ltPwhc kI6VOEbHLkU6C656oyQ== X-Proofpoint-GUID: rfwjZHSGcZ391DMS3TD1IYJ4ZONmf2Hh X-Proofpoint-ORIG-GUID: rfwjZHSGcZ391DMS3TD1IYJ4ZONmf2Hh 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-09_05,2026-01-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601090128 Mutex guard allows to drop one goto/break in error handling and the less expected code of assigning -EINVAL to unsigned size_t count variable. Suggested-by: Jonathan Cameron Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jonathan Cameron --- drivers/cdx/cdx.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index bbde529aaa93..588dd12e8105 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -616,7 +616,7 @@ static ssize_t rescan_store(const struct bus_type *bus, if (!val) return -EINVAL; =20 - mutex_lock(&cdx_controller_lock); + guard(mutex)(&cdx_controller_lock); =20 /* Unregister all the devices on the bus */ cdx_unregister_devices(&cdx_bus_type); @@ -624,10 +624,8 @@ static ssize_t rescan_store(const struct bus_type *bus, /* Rescan all the devices */ for_each_compatible_node_scoped(np, NULL, compat_node_name) { pd =3D of_find_device_by_node(np); - if (!pd) { - count =3D -EINVAL; - goto unlock; - } + if (!pd) + return -EINVAL; =20 cdx =3D platform_get_drvdata(pd); if (cdx && cdx->controller_registered && cdx->ops->scan) @@ -636,9 +634,6 @@ static ssize_t rescan_store(const struct bus_type *bus, put_device(&pd->dev); } =20 -unlock: - mutex_unlock(&cdx_controller_lock); - return count; } static BUS_ATTR_WO(rescan); --=20 2.51.0