]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soc: qcom: pmic_glink: Drop redundant pg assignment before taking lock
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sat, 11 Jan 2025 17:23:26 +0000 (18:23 +0100)
committerBjorn Andersson <andersson@kernel.org>
Wed, 5 Feb 2025 03:16:01 +0000 (21:16 -0600)
Commit e9f826b0459f ("soc: qcom: pmic_glink: simplify locking with
guard()") was on top of a fix [1] which was moving the 'pg =
__pmic_glink' assignment into the critical section.  Unfortunately the
actual fix was not applied and instead rebased version of the next patch
got in.  The resulting code is in general correct, but now there is a
duplicated assignment 'pg = __pmic_glink'.

[1] https://lore.kernel.org/all/20240822164815.230167-1-krzysztof.kozlowski@linaro.org/

Fixes: e9f826b0459f ("soc: qcom: pmic_glink: simplify locking with guard()")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250111172326.101779-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/soc/qcom/pmic_glink.c

index 052c292eeda61b798f8c58ebbf04efd36b0fca2f..cde19cdfd3c7fb74a33dd16833e8693c6f9cd072 100644 (file)
@@ -233,7 +233,7 @@ static void pmic_glink_pdr_callback(int state, char *svc_path, void *priv)
 
 static int pmic_glink_rpmsg_probe(struct rpmsg_device *rpdev)
 {
-       struct pmic_glink *pg = __pmic_glink;
+       struct pmic_glink *pg;
 
        guard(mutex)(&__pmic_glink_lock);
        pg = __pmic_glink;