From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 6ED6719DF86 for ; Tue, 27 Aug 2024 10:30:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724754630; cv=none; b=bpSIG2EddpB0rD5EwAfLRnE1pKRJGn7ZhTq22URsWSSjy1kzbzjwgcAjufe3oqLubnuzfy8ZDntDC1M0ONypelfFHbCMeyOjCAyM70e/g28BE0iuib4HMRtl+B2ZbECD9zL49YxUlryvvWSM7/KSW9c42/uldsR5iUN/G7XNl/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724754630; c=relaxed/simple; bh=nT80rdayA5UHtA0WJnFTe/3oVId9QXu7cD5rdeRsvsU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=NgJbaWPcICeML3cHLMbT6ZfyPMiAl2aHoQDuBlwWO9eaDln1j9ZNbJb4FA8vIRV3HH3eObkytouWp2ColZ9a7pFKy0zjYCxQSt4+GmdLDbJ5kmKPx0omWSlqptKBtGLIt6FXeMP/PpRfKEqRX8HUzxYJYDp0ylvsgfAMJ4QLfMs= 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=VpfdbBPd; arc=none smtp.client-ip=209.85.128.43 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="VpfdbBPd" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4280ac10b7cso3449855e9.3 for ; Tue, 27 Aug 2024 03:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724754625; x=1725359425; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=W3VBFYpmaqRCs+Se9LeU7unsLD0EFFfpK+JC6xNu3vw=; b=VpfdbBPd+0gwW+LO2iGGQEJjaq13m1HG4meBdWJMrXmEb2TWVV+8cH8ADm5qjewGNu Lb2fRo4B3EQjj1no9D/Tl+PsGYJSYV8kAdFrBz6BpfrPZ1lpj083gF7J0mhovSMjxa3Y U+2FnCwj4cyGRHxCV/d0grEI+hT1JaI4mgaXO7+GFFLHAirVp949h1kYyC569ay4rP1V 5b4JIiSFgx/iTRNmrrIGxknWxeEH2OGkcHPjRtb8WDvUgCU2pHZTfNk2iqPv3dLztQMX 3Z4j850nf2IfevimKfEIt/dtLPhTMkIBWDdlKeH7lcehZ8QbGulDK+8+n6CaGSNfmBtP zPcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724754625; x=1725359425; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=W3VBFYpmaqRCs+Se9LeU7unsLD0EFFfpK+JC6xNu3vw=; b=GdXVWjEEBTb6FW5a9D+b5S2fqgRzWec9QBUwtVrZMO0Zba2f+GsxPz6kxI5k+ZXMNo JPGzSqav4m5cGVlbnoQITSt/TvG1SFAbyE8GjszoZ7HgZXL7PbZlErbGUFqoq0HLxUvw gvVH6SEKlDMp07UJuyd/ymHJ5gX1Yya0bbMAeCdkeV7ExtzHVRRryqf6UtLbXXq92/nY 5gU0fQ5F8ncKB4Q0oz3deq0yEkGdAlJIqW0mojjpbMHKsoHFYVhtQMr5ZVndSqm4Rw0+ PU6luvOsysnAKGTb6MCKvz0oHKN4BNCFsq8qJEw8v073CSsOPRZwITDHL8Py/HYnZI5e oApQ== X-Forwarded-Encrypted: i=1; AJvYcCX3tbxpGzVTGTu2SwSfb8QTgtkHP1Wn3UV6ZINpNkJLsVPmrFbTFaTlzWUDDa82tqo7yGaKTRCITzK9SGk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyfod9Sq8ofJcn/jKF7VzjdRNOJMr6mb4/1o+d0TmOIAGxEsf8Z ly269IO4c1Mu5d6DxNTYuQbCyipxMlvE2llPQje3EVIRffIFzcVq0bjbz4hU4C0= X-Google-Smtp-Source: AGHT+IE1vEOGOGSPbk8DqUrG92QCcaEHUw1sMQDEkeJAs2xvcYkh9LNNcDwEqw3hyc/tlUYAgEF6sg== X-Received: by 2002:a5d:6c6f:0:b0:368:4e31:7735 with SMTP id ffacd0b85a97d-3731191ea94mr5120606f8f.9.1724754625456; Tue, 27 Aug 2024 03:30:25 -0700 (PDT) Received: from [192.168.1.20] ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3730810fb76sm12879587f8f.8.2024.08.27.03.30.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Aug 2024 03:30:24 -0700 (PDT) Message-ID: <6f2c976c-2757-43c5-805f-e67724328b65@linaro.org> Date: Tue, 27 Aug 2024 12:30:22 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 02/10] pmdomain: rockchip: Simplify locking with guard() To: Jonathan Cameron Cc: Ulf Hansson , Heiko Stuebner , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Bjorn Andersson , Konrad Dybcio , Geert Uytterhoeven , Magnus Damm , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org References: <20240823-cleanup-h-guard-pm-domain-v1-0-8320722eaf39@linaro.org> <20240823-cleanup-h-guard-pm-domain-v1-2-8320722eaf39@linaro.org> <20240827105927.00007ac7@Huawei.com> From: Krzysztof Kozlowski Content-Language: en-US Autocrypt: addr=krzysztof.kozlowski@linaro.org; keydata= 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 D2GYIS41Kv4Isx2dEFh+/Q== In-Reply-To: <20240827105927.00007ac7@Huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 27/08/2024 11:59, Jonathan Cameron wrote: > On Fri, 23 Aug 2024 14:51:06 +0200 > Krzysztof Kozlowski wrote: > >> Simplify error handling (smaller error handling) over locks with >> guard(). >> >> Signed-off-by: Krzysztof Kozlowski > Musing inline. > > LGTM > Reviewed-by: Jonathan Cameron > > >> --- >> drivers/pmdomain/rockchip/pm-domains.c | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c >> index 5679ad336a11..538dde58d924 100644 >> --- a/drivers/pmdomain/rockchip/pm-domains.c >> +++ b/drivers/pmdomain/rockchip/pm-domains.c >> @@ -910,7 +910,7 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev) >> * Prevent any rockchip_pmu_block() from racing with the remainder of >> * setup (clocks, register initialization). >> */ >> - mutex_lock(&dmc_pmu_mutex); >> + guard(mutex)(&dmc_pmu_mutex); >> >> for_each_available_child_of_node_scoped(np, node) { >> error = rockchip_pm_add_one_domain(pmu, node); >> @@ -943,13 +943,10 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev) >> if (!WARN_ON_ONCE(dmc_pmu)) >> dmc_pmu = pmu; >> >> - mutex_unlock(&dmc_pmu_mutex); >> - >> return 0; >> >> err_out: >> rockchip_pm_domain_cleanup(pmu); > > I wonder. Could you use a devm_add_action_or_reset for this and allow early > returns throughout? > > Would need to take the lock again perhaps and I haven't checked if there > is any issue in dropping and retaking the mutex however. > The block logic is non obvious so I couldn't quickly figure this out. I will take a look, but as you already pointed out it is a bit further from trivial functionally-equivalent cleanup. I might mess with the locks. Best regards, Krzysztof