From nobody Wed Dec 17 16:10:13 2025 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F6692236EA for ; Mon, 9 Dec 2024 12:24:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747057; cv=none; b=BtI0STVUoHRR4a9Cjv50ZGYqEzmSVyACUc3/vFGn0TDBCsm8zOmxIXKmfk9Qq4EJJsxn9mBWPmoHpzSZb2+t3dNNnWU3S0wDj9J8hSCmHQr4Kd5V31wptGbkQo1Pp3BhnWoEtN4P/sWY8oVPQvtaUwPmzRo0Trtdymj1GnkAdFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747057; c=relaxed/simple; bh=4OE2UNumV4s+P2YUC0SiuAHNvh4UuP4uD4bB25xADG4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UtsL4/fbbyg45Q9JBJ+Pp0KzmoYpACvdWfsM7De7eRzJR+Y8NTIEOcxBanoPTB6Dia4Fxn38qE5gVTAeRohtu6wqvfB470HXPUqg7yILgzik/Tb7w4DXdsUQ5VxMvbW4T+qN73FUPosRIZwho0BMGZG6ALg8297xU/pjSStGlkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=h84n/pQb; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="h84n/pQb" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-aa6647a7556so35748366b.2 for ; Mon, 09 Dec 2024 04:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733747053; x=1734351853; 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=eYnPC+3dnQ3xTBOM4P/CUIbuS3rg7DS/lMF/rRnPfpc=; b=h84n/pQboWq8MNlXDDWrDmlmtWfZU4esF7eLnQx1emFtcm2fMxuYD6J5XR1iwlo81W CY3gAtdN75j84IupY09vcoTnEqyQmCe+9h2ZJbaeEQzoPdO96SwhSqYIqW1ndrNHcZow y7fmdiRwcjfvPDCDPQGRwTGHcxZkz9c8iOmshY4Wn3ogPaAG86eZC6Q/rhAUjY7RWHEU dsp9enWG4kZkhYYjPtp4850OJG43UmiGZejVrrtyOFDp75Lw57/aZeeRCvb+guffVUQQ qq9T6IZRK7BH3YjCa4FjOyic3UuNAspeqZh7HjvQtSdWZYQ4qSrXFNweqzA8UEH9em9N 9/0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733747053; x=1734351853; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eYnPC+3dnQ3xTBOM4P/CUIbuS3rg7DS/lMF/rRnPfpc=; b=Bw+CnD+j6rBb9q8pFvK5q+ppg/JbWWfKGO57GxaBVrWpT3c2Q5OOFMclrFvpzvzhCb AKFOXMaGq4WNFdL1Sb33oCaumuF83N3Axd+OWIEGBqx5RgIqzzyFUq085kK1PXx0OgxW sAsy6ZkG3VOnn1XMgMG3SoVuAMRS49l1chJuhnSOHEuG6EQTjB2b8tLVhnAKa8kfFwFp q3wEcZFuyFznAVdSu3JNHD2jL7fKdc4J10dWRBRDwS815Kxp6w9ScJxG8JTs40R7YKbs BoNAiuDSOC1hd1tsZnk0eNQJFcu2vaQPm1DyACbtNoB3AXUtSQZkcv7pfjwSQFrGaM2b eafg== X-Forwarded-Encrypted: i=1; AJvYcCU/FLOW+l0UdTjIWUpTR9Y6M4pSvcPB3VjF8UWhFpNDdUzYxiIL9p3iD9Bs5zwlu6RyCrf+17Dkqn4+jls=@vger.kernel.org X-Gm-Message-State: AOJu0YzJpxtGjcNaQ3aA4HP7iS4crx9HSFDyIqIJ9Xyv5ujZnrvzzHNa pa+PqBZwK8TP1tw1MwnRvLxW54+gbiBMbilvfc8J6PP1bqjT0cSg9gKNKFVcWUshrhv0uT9hfmX n X-Gm-Gg: ASbGncvWJSmYQY0zucXG2Cm6RgI/rdN8wAqmCJTK/056thG5JER3x43VeA9NKC0wepG RAwpi6MKlyCzbErr7PhiKI0/MWdOFsqBK07JG3y0ZspvD2yygbRyABJgK8ykSOpPpcXI7k3E+Zu DqKMJkHfdr8JN3e+/MqrLnK4MONRLGh5nIFy1hpangkjXz+KxMnwymuY7C+OB0BZDQijNIzHx2Y defFpSRVeIXEAYbKLrFO3mPMx5YePWVGXXECs03VGwYaCd9lW+4EoW2ai+mPXUXMQ== X-Google-Smtp-Source: AGHT+IGA6c7ObX/AOXazYgFDpzOOBnfoe8Yqzc7iHHBjGsOsomSWtlEo9XgjPuAQbV9iNrzjXdFM6A== X-Received: by 2002:a17:907:180d:b0:aa6:9407:34e1 with SMTP id a640c23a62f3a-aa694074166mr69867966b.10.1733747053409; Mon, 09 Dec 2024 04:24:13 -0800 (PST) Received: from [127.0.1.1] ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa66b96a249sm309925866b.159.2024.12.09.04.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 04:24:12 -0800 (PST) From: Krzysztof Kozlowski Date: Mon, 09 Dec 2024 13:24:04 +0100 Subject: [PATCH RESEND 1/3] clk: qcom: rpm: 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: <20241209-cleanup-h-guard-clk-qcom-v1-1-b1077540230c@linaro.org> References: <20241209-cleanup-h-guard-clk-qcom-v1-0-b1077540230c@linaro.org> In-Reply-To: <20241209-cleanup-h-guard-clk-qcom-v1-0-b1077540230c@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2493; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=4OE2UNumV4s+P2YUC0SiuAHNvh4UuP4uD4bB25xADG4=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnVuFoTo9hkhnYTavcOtwQzo5Vc6u5rjORkxajj HdN4pZbS8GJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ1bhaAAKCRDBN2bmhouD 12raD/96VfLAsBFtWhV3CZjopOabQG1tVIiYugRecFOeUe4huzVbCLV24Gqo6CtGetm5JOKfHz8 iOSOY+JilVXTGN/T9VCT4Y1i7fMcLnSTCtj75satrIA5mLoFRShxSQmz90dkJ0F/7JrIaiQclr4 XTEHI9O+9ixi3Qyoha3GeYDXlNnXvNuqJZHG8K/nhGiqhgyLASdqi4hwF5RickcC92c67eAkKp3 XvmvRFhuej/UHMCXyXF38kpM5XvOJw3VfV6p7A56yGJ+25c3ubuMS49pob3f5fAxPMShjJixZDu D4np7E0/HR6uPHdSBwn5hTNIs/xbID39CkOedY+jBf4pSHr3ANd2YhdAFtPzIY8OWeFyLapwFGP m/v/pr/u7UDpG8Iao7aKOfKQHH1ntv4CSbW842ouj1ialhf6u8Tu2+KK3jFam/rZcszMRtkU3tn 1NwjLkqtoQS5fLMLXM0NwY6hBKGx0E93IoJv4T6VbNFxzpveX1jQYLXPiOwVY3r4RkB9rzrpoFZ 5X2yWBqKwPg8Q6m/hTMCFt2EDkgyrbsgDHtzRDW3Lqu95IKhlhh+ulbH+7kL3mszVT9rie5XONW of1ch36rPll/SRPjtrYKn1RsyEQcfe8hboHNol/IBiNvb3nqhn9QCO8hakL4OPLlj/s7p+mm1ab 1AloIYvxm2ViWPw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Simplify error handling (less gotos) over locks with guard(). Signed-off-by: Krzysztof Kozlowski --- drivers/clk/qcom/clk-rpm.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c index 9da034f8f2ff504404abc4f7a0d3b8fb841a6ce0..ccc112c21667ebf8522b06b3723= 4f46c69b07698 100644 --- a/drivers/clk/qcom/clk-rpm.c +++ b/drivers/clk/qcom/clk-rpm.c @@ -4,6 +4,7 @@ * Copyright (c) 2014, The Linux Foundation. All rights reserved. */ =20 +#include #include #include #include @@ -224,10 +225,10 @@ static void clk_rpm_unprepare(struct clk_hw *hw) unsigned long active_rate, sleep_rate; int ret; =20 - mutex_lock(&rpm_clk_lock); + guard(mutex)(&rpm_clk_lock); =20 if (!r->rate) - goto out; + return; =20 /* Take peer clock's rate into account only if it's enabled. */ if (peer->enabled) @@ -237,17 +238,14 @@ static void clk_rpm_unprepare(struct clk_hw *hw) active_rate =3D r->branch ? !!peer_rate : peer_rate; ret =3D clk_rpm_set_rate_active(r, active_rate); if (ret) - goto out; + return; =20 sleep_rate =3D r->branch ? !!peer_sleep_rate : peer_sleep_rate; ret =3D clk_rpm_set_rate_sleep(r, sleep_rate); if (ret) - goto out; + return; =20 r->enabled =3D false; - -out: - mutex_unlock(&rpm_clk_lock); } =20 static int clk_rpm_xo_prepare(struct clk_hw *hw) @@ -324,12 +322,12 @@ static int clk_rpm_set_rate(struct clk_hw *hw, unsigned long active_rate, sleep_rate; unsigned long this_rate =3D 0, this_sleep_rate =3D 0; unsigned long peer_rate =3D 0, peer_sleep_rate =3D 0; - int ret =3D 0; + int ret; =20 - mutex_lock(&rpm_clk_lock); + guard(mutex)(&rpm_clk_lock); =20 if (!r->enabled) - goto out; + return 0; =20 to_active_sleep(r, rate, &this_rate, &this_sleep_rate); =20 @@ -341,19 +339,16 @@ static int clk_rpm_set_rate(struct clk_hw *hw, active_rate =3D max(this_rate, peer_rate); ret =3D clk_rpm_set_rate_active(r, active_rate); if (ret) - goto out; + return ret; =20 sleep_rate =3D max(this_sleep_rate, peer_sleep_rate); ret =3D clk_rpm_set_rate_sleep(r, sleep_rate); if (ret) - goto out; + return ret; =20 r->rate =3D rate; =20 -out: - mutex_unlock(&rpm_clk_lock); - - return ret; + return 0; } =20 static long clk_rpm_round_rate(struct clk_hw *hw, unsigned long rate, --=20 2.43.0 From nobody Wed Dec 17 16:10:13 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64272223703 for ; Mon, 9 Dec 2024 12:24:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747058; cv=none; b=tvESxeZpE2+cnI53DYVLOH6bDzsWff9MBEBvp+pTvvLh0DFRjqVaKFa7mdC42j9/0PqtH9H3fqyos39zQ28xW366sHKYja30kUdI08ecnhrTTvOxZ5mbF3tAqsORBhizs3dkkDiDzbi+UR0/YMMl/f0Pg/Yc/4I0lZvLdtPPTqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747058; c=relaxed/simple; bh=rkMjCrwS1+wByjVOGZBOyBmwHcPRefAACRVZAjVFMrg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uB4z+WJxfNWyennvl4GKfBRVuzG34XJahc+g8dqBWHwZHQA4vcH47FdsJOPTL8BuneHi06pYMzKNXg6oNaXxOEnI6sBxbqNsm+VJNEI8qb5w6Q/cXOqwNUZw16TSl1a8T09hZHgxbMAQTSBwO2wqOsGEgM4exTLUxqWLIC3HQFk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=TSkfFdnj; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TSkfFdnj" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-aa65f707419so40886066b.2 for ; Mon, 09 Dec 2024 04:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733747055; x=1734351855; 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=4VS86PQrU3aNTPQz7X0NdV1vS6PaGx8hn6CNMCEHmEw=; b=TSkfFdnj85CTjX7fstayGkA+yd08BtcXBT/3toiUjY3nBkkYZBXSHhN3uk3kBVpPMc vAexlKp7C2eSDL63Hz7EXl3hZSBshsIx/mqlkgt8AR2Yh2U1JYzuWX4u2GKtPjE/ujVs RAykGzOOb37O2A/EDHjXwX7tWS++CrZI5fNBDrTMVIl55WgvPENwXKfpEq0wKsYToyBG uDkaT0PcH/XRXTTBZhD/RgZzA26FxUcOKXXR/wbkCI8JHxMO3WFFKdnTAIOWpjpKiy02 7dhz+75DkHynof/09jlwwFvPdxmM9C33wIwuWayf3bHuZUsMy2WenQKMXRmVSLxNklM5 W4SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733747055; x=1734351855; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4VS86PQrU3aNTPQz7X0NdV1vS6PaGx8hn6CNMCEHmEw=; b=dB86OPT1VmMS4kCUfa0wiarzT4xH3gtXrkaR6kB5PuyUHYt7pWUX1zKewoRFZxdYLF lsiMxl4lad929zM48H+5xiVz+OHvGdidfaZrtJHH8cgjn4y5ywmBTZntJfbc6FrVFWVC GQs845mP30QPXCQEIS30HQmx2kwLR3Q7hZyfNwFoO9ShobhyTqutm1MKToNlL5au4Qrn +N6vx7uKQ4ojzyaEQU4ghwXJfXoBkggryCf1zZsqMb/jMla0WjmfdlgbypEs6pPN0Ugb 66pkuaflZaA52qye6Ak3fG8ZyIukKNQeipXLuwsSP3ciATuji+bkpysuDw10byvgAlab 4Kkw== X-Forwarded-Encrypted: i=1; AJvYcCWUIA6GPIf8qjQEo1qZ95uuWvZAo5xtWsluvCG8ZAEtgSOTdW5c0XMy3/cJDcFjlXE+tszhGBHkpsoE7so=@vger.kernel.org X-Gm-Message-State: AOJu0YxmYTMCMsexdFyqeWlEa4Simn5MWTozviF/waF9As/bkotE8ap1 asjwpJdA65wMCHfRiBn/oZrt16aTkwkgRqO5vKZbzlRZDlQ5vjeZ98l+eqdpMe4= X-Gm-Gg: ASbGncs36dN82I1O4S92uJtC/jS9nFIJVeUS9delkoFsTy617HKoxi6OE+RDbyDcv6R uIN8jrbC70Qqq/F95L/fVrArUEB2wKXzg15m55GIGVCs/YNl7hxjg5YQLYuYGCDWDrHQwMsd03d P4VHPiWy6dcq29lG6dhoWqQXHIqPSr3JnIJ4F1JrWFGE0AfJmxl0eeTZNfaFhPXvy/is3wswFYd LPDba1I6oVvb5MzinT8yADJDcjxPgCgoBH+CgtfnR+PFbW1p10W2dHnjby9omZwZw== X-Google-Smtp-Source: AGHT+IHMa1lVKER8h4Ap0+h8iEA/ASsQQiOkTcbxptlpeVP7AhBWBqczT0R0GsKDETc4Mf1TgulAPw== X-Received: by 2002:a17:907:874a:b0:aa5:3e81:5aa2 with SMTP id a640c23a62f3a-aa639feb836mr488047766b.4.1733747054666; Mon, 09 Dec 2024 04:24:14 -0800 (PST) Received: from [127.0.1.1] ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa66b96a249sm309925866b.159.2024.12.09.04.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 04:24:14 -0800 (PST) From: Krzysztof Kozlowski Date: Mon, 09 Dec 2024 13:24:05 +0100 Subject: [PATCH RESEND 2/3] clk: qcom: smd-rpm: 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: <20241209-cleanup-h-guard-clk-qcom-v1-2-b1077540230c@linaro.org> References: <20241209-cleanup-h-guard-clk-qcom-v1-0-b1077540230c@linaro.org> In-Reply-To: <20241209-cleanup-h-guard-clk-qcom-v1-0-b1077540230c@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2526; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=rkMjCrwS1+wByjVOGZBOyBmwHcPRefAACRVZAjVFMrg=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnVuFpiHvV0uVRDjZL66G52Y9rZuBpcDh97yVqm 7VCNFzDmjqJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ1bhaQAKCRDBN2bmhouD 1z6bEACDJRMV3tKG8OzJzEzGyfz0lOZpMOl3jN/tTBoHX1ttuGWTy4ndNdqgrS10DEBZX6AukHR 2RkvqWkTyKKdNzNQuzOUVZceVDzp6+14dJh8OmLv9rh3T1CybD01NWxDyX9E7dHwpzdzjKuOzik ysttIokEqGs7IBZ/l/nokgkJYYEd29LH5YirY5+WRuNafy79CfiPlh6J+BUxTMaw+qQuWFmoD4t PQFyq2OQiBrgTYYxqsxrT4JmK2wXe6+MD2E7A6hE6VJdr1O23cjjMVX3b6+Y0+zZbP6h7VO6cUc VyQzxXWG70zOEUW0ncp8VxGy836HsZoZT6XQuxBfOW+3dq2jEzkzDA3JMmNc/gFNaqb2eOHd0ll P6LbKNLNdJScsdo+7cCv6RlcXMffERSL6CNnOY62KiEfAIJyXrxcvOL6RvGd7qZA6Dom2kJeNAq 6M3qnKP7ZQsFDIENjvEUPMTO95+zN6Ql5fL8pkAPLtsOESS6QvIBV7qnYM+dyTwGeTMJzqk9LZ6 g/725GdkH60DSX36J3YUYaUjUqos7CJFgBuENmayd8k+e+t3MOOzpeh9pEF0K++9Z8PV1kbpVOP LEy2KoplchfXrzS10mQIx+q5O2+boaYrOiH4dh5kiLIoLpYZv1npQMxIclDZpW2qHr0xOE8sctQ WzPlTI+EO1P8OkA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Simplify error handling (less gotos) over locks with guard(). Signed-off-by: Krzysztof Kozlowski --- drivers/clk/qcom/clk-smd-rpm.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index 45c5255bcd11bae69b83138ba1d5e52a8a3f3be8..b8cd9f7301194a539d5fb18f974= a5600496a1032 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -4,6 +4,7 @@ * Copyright (c) 2014, The Linux Foundation. All rights reserved. */ =20 +#include #include #include #include @@ -309,10 +310,10 @@ static void clk_smd_rpm_unprepare(struct clk_hw *hw) unsigned long active_rate, sleep_rate; int ret; =20 - mutex_lock(&rpm_smd_clk_lock); + guard(mutex)(&rpm_smd_clk_lock); =20 if (!r->rate) - goto out; + return; =20 /* Take peer clock's rate into account only if it's enabled. */ if (peer->enabled) @@ -322,17 +323,14 @@ static void clk_smd_rpm_unprepare(struct clk_hw *hw) active_rate =3D r->branch ? !!peer_rate : peer_rate; ret =3D clk_smd_rpm_set_rate_active(r, active_rate); if (ret) - goto out; + return; =20 sleep_rate =3D r->branch ? !!peer_sleep_rate : peer_sleep_rate; ret =3D clk_smd_rpm_set_rate_sleep(r, sleep_rate); if (ret) - goto out; + return; =20 r->enabled =3D false; - -out: - mutex_unlock(&rpm_smd_clk_lock); } =20 static int clk_smd_rpm_set_rate(struct clk_hw *hw, unsigned long rate, @@ -345,10 +343,10 @@ static int clk_smd_rpm_set_rate(struct clk_hw *hw, un= signed long rate, unsigned long peer_rate =3D 0, peer_sleep_rate =3D 0; int ret =3D 0; =20 - mutex_lock(&rpm_smd_clk_lock); + guard(mutex)(&rpm_smd_clk_lock); =20 if (!r->enabled) - goto out; + return 0; =20 to_active_sleep(r, rate, &this_rate, &this_sleep_rate); =20 @@ -360,19 +358,16 @@ static int clk_smd_rpm_set_rate(struct clk_hw *hw, un= signed long rate, active_rate =3D max(this_rate, peer_rate); ret =3D clk_smd_rpm_set_rate_active(r, active_rate); if (ret) - goto out; + return ret; =20 sleep_rate =3D max(this_sleep_rate, peer_sleep_rate); ret =3D clk_smd_rpm_set_rate_sleep(r, sleep_rate); if (ret) - goto out; + return ret; =20 r->rate =3D rate; =20 -out: - mutex_unlock(&rpm_smd_clk_lock); - - return ret; + return 0; } =20 static long clk_smd_rpm_round_rate(struct clk_hw *hw, unsigned long rate, --=20 2.43.0 From nobody Wed Dec 17 16:10:13 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2B82224894 for ; Mon, 9 Dec 2024 12:24:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747059; cv=none; b=fAAZBxfDgFEPKdaAUi9F+wwjFRLMxCvizU0OezK69bCSD83/W/bZLPt0SzDunDSCXz78PL6Fav+dt5gxRkh6nCyB6zSFLMGN5n882JYRp3kzPq6aiR76FQywQpdoOQWAtpq7NpmkrBvibBSA05gPeZ8jeXThHsP4CvCPGt8GUqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747059; c=relaxed/simple; bh=dXTvMwZ3IWa8w/PCirVYpiMdDockPwSZQVUAZm7Ua1o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gnxec4hgdcfX4hroVH+Tk3nWonJQtqOfFRKf2FW/pbEoWtDpmlzwZFQD5Z03ELAddr8pv0MIGrc4IR0ZeZUHz4Ms+rBto9P6XT2GnLarbVcJIdIfSn7hrV4jb7ekpWYoVUQ18R53uvCQCPLt7wj1vSR7n5VcOsGx4RfkeDEwAw0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ZwjWWKg/; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZwjWWKg/" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aa680fafb3eso11770266b.3 for ; Mon, 09 Dec 2024 04:24:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733747056; x=1734351856; 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=JoCVrD28ayqu5D/DI17RscermoixTp22627F0aNO5EA=; b=ZwjWWKg/iwSlnFS+GTCOaFYbL/Y4ag4IGujXPUwQJ7U5gJfs9Z6M8NxNePkPFWv3y4 lMUNLBgNHer3UmMQVJEcXybf/nDsJX81h+juUNafmMuMUtbA6Os0ukHNci4yAnj01pKN tcUr66SbmlX+a+5Ilk4I12bdQKKdIqhMVmubbrVAXwH4cOkBd9ODOwrUuypzD9V0FhWP mLdLzkNrwGwWcJHC8RwRn+sLaFzqqBGYDSQ8rF1O1weHkM/GxDbr6a6oaEla6WbEB+Ta itX9PTo4/Rk2U9dTfYxnc28QEXup+J7jEGlRFvQohb/5aPQc+TjHX+EetdY4fSnk8zrh pshQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733747056; x=1734351856; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JoCVrD28ayqu5D/DI17RscermoixTp22627F0aNO5EA=; b=tvUyV6vi8IMIBDQN6w1yzJgUN4q6maFSgRC6gKxTM9EbeMUmfJNHWFRadNZRQplT6V Ii+XrGgNbKG/1dRP70s9ln2AKjFlpSPUQt81I7lm+lQZQHrwWSuV548bxEXg8f/7BOR4 zBtRtyQcbTjF1qkK0sfZJdv7cDQPcbCb/4v2ZD76q98InzsQchKrfsowLkMrvWTGzgMk 3iHdqp6luAAMTXyVW+5R1LkA+EDWX/m7Und0L4JVvqaxukdBos1J0Bswn1wxfCbMnFOL /Mh+ySzcGn8wMKaSpLzLeVdJYjZw8tGzWkAL/ONUj4J+5KmEEwWu9BRSVSV3gr1lnqhO fR4Q== X-Forwarded-Encrypted: i=1; AJvYcCWqBDG2inlAzC3QAagBt+a3xg6em20V51lmP780thR5GK+f6A8OvtvEkWBvTLnSOe8bV8hJBJShI8OjXe4=@vger.kernel.org X-Gm-Message-State: AOJu0YzQO65XhSagqykmq1KOK17eKBG/qPJCVEJ/pTlMXjSuJGAUhUL7 bnDDNpzDtcyy83VnWA6PghgAP8wU3HNSbUzMvLyFuWd0cekxM5Q7nnKXEWjL9u8= X-Gm-Gg: ASbGnctMBi3bsL/ath597AquSooK6d8L1zSbWz1eSlHni9R4sKtnwS1+6BEl++I7B63 1v0mBQTMGjdjAfNLATLvsV/c75A/khV7rdml2wo8PyZYBtHRZt1cctf8KAU3NO8btI6HnhH9to7 teC4A2ODvZDgA+TjM1HncHLMMcUShXk8sef7YX47i4m9Ngg4t7PdVh/aQnOt7L6JLC8w+I0EW7R dGRSchh1YIayNTRL8FCCJHleODJxmYi6xVa2HRnGrRqkt3J3rIywNZ/hYNwbRyHUA== X-Google-Smtp-Source: AGHT+IEL0p06Hwmo+9E/f1lCO4dyZG2n/TdjzYJd+woyN99M4MYMI2vd+kMHzKES2YH6I7KFGRLVew== X-Received: by 2002:a17:907:c008:b0:aa6:79e6:5b03 with SMTP id a640c23a62f3a-aa679e65d87mr176768466b.6.1733747056131; Mon, 09 Dec 2024 04:24:16 -0800 (PST) Received: from [127.0.1.1] ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa66b96a249sm309925866b.159.2024.12.09.04.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 04:24:15 -0800 (PST) From: Krzysztof Kozlowski Date: Mon, 09 Dec 2024 13:24:06 +0100 Subject: [PATCH RESEND 3/3] clk: qcom: spmi-pmic-div: 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: <20241209-cleanup-h-guard-clk-qcom-v1-3-b1077540230c@linaro.org> References: <20241209-cleanup-h-guard-clk-qcom-v1-0-b1077540230c@linaro.org> In-Reply-To: <20241209-cleanup-h-guard-clk-qcom-v1-0-b1077540230c@linaro.org> To: Bjorn Andersson , Michael Turquette , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1606; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=dXTvMwZ3IWa8w/PCirVYpiMdDockPwSZQVUAZm7Ua1o=; b=kA0DAAoBwTdm5oaLg9cByyZiAGdW4WqjVaZZPkcN8v9OPTJHUcgo366JtrL28bgL8+92JHHiT okCMwQAAQoAHRYhBN3SYig9ERsjO264qME3ZuaGi4PXBQJnVuFqAAoJEME3ZuaGi4PX+/cQAJk+ Nt95XiYbAfyAfpF+qC/Os14df5UkJTTbXxd/sOxHbKrDVc8xSx1fyqDWRaTcOD5Pe0wiD4glAzh FlXAenPqrW8yS3Vsne+gjpl3Yy9MknYypm+Wieyxvw3Uc0WUYJ9J3uf24bzJk/a0RGQIG/lq/Qw oOH6GoFnzTfQCDQeILelFLUkuYrnxQi+k1rs5rdVVL+8JYOBNoOVnjcA3DGFXvHmfWlV+f5xJcF JtcXMOUMZVrhra+7Tp7oLXbgaANGpci3rsCG+1cYV0OHsa0nqSivyPVfaIvX2PeBYJuiRUxbnBM /07FS0Cgmh4IYDM/zGJUQpXv66VARq3957sN/+kxJa3aOGa7KUjn8GQTZiu/pr5vr3QHA81ou76 CbqlYK4hEWS59pz/LAp5afj6TZIHqK+4v/oHQfttCrpGI+nojazSGCIlC0oA5Pkvz6rDlllc19n YEo90GQZW5Z06eYCyzJ2UocPPDpWsGI3vU9aNgpXoT4RYLSvrWUXLcLR3WyF72Vsa8mCH/oEVab oDk2Vl6hs7wb/GtKKh2ljMeeXrL1k+JuSnERSXmF7hPTqNNvlJF7bO7xJVX6MJZOtxhuz5ELHyT j8Je7O7bNIj7bs58E1Gfvfdo69Pk9YphLl8kHumVDITdXye1khfPUhziiSbxHT8okOoRoCITbw0 ymeVV X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Simplify error handling (less gotos) over locks with guard(). Signed-off-by: Krzysztof Kozlowski --- drivers/clk/qcom/clk-spmi-pmic-div.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/clk/qcom/clk-spmi-pmic-div.c b/drivers/clk/qcom/clk-sp= mi-pmic-div.c index f394031eb0e520b1b59e863dfbda4312f4f8215b..41a0a4f3b4fb316827365a52207= 9dcd99630c49f 100644 --- a/drivers/clk/qcom/clk-spmi-pmic-div.c +++ b/drivers/clk/qcom/clk-spmi-pmic-div.c @@ -3,6 +3,7 @@ */ =20 #include +#include #include #include #include @@ -140,30 +141,26 @@ static int clk_spmi_pmic_div_set_rate(struct clk_hw *= hw, unsigned long rate, { struct clkdiv *clkdiv =3D to_clkdiv(hw); unsigned int div_factor =3D div_to_div_factor(parent_rate / rate); - unsigned long flags; bool enabled; int ret; =20 - spin_lock_irqsave(&clkdiv->lock, flags); + guard(spinlock_irqsave)(&clkdiv->lock); + enabled =3D is_spmi_pmic_clkdiv_enabled(clkdiv); if (enabled) { ret =3D spmi_pmic_clkdiv_set_enable_state(clkdiv, false); if (ret) - goto unlock; + return ret; } =20 ret =3D regmap_update_bits(clkdiv->regmap, clkdiv->base + REG_DIV_CTL1, DIV_CTL1_DIV_FACTOR_MASK, div_factor); if (ret) - goto unlock; + return ret; =20 if (enabled) ret =3D __spmi_pmic_clkdiv_set_enable_state(clkdiv, true, div_factor); - -unlock: - spin_unlock_irqrestore(&clkdiv->lock, flags); - return ret; } =20 --=20 2.43.0