soc: qcom: pmic_glink: simplify locking with guard()

Simplify error handling over locks with guard().  In few places this
elimiates error gotos and local variables.  Switch to guard() everywhere
(except when jumps would go over scoped guard) for consistency, even if
it does not bring benefit in such places.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240822164815.230167-2-krzysztof.kozlowski@linaro.org
[bjorn: Rebased ontop of v6.13-rc1]
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c
index caf3f63d940e35ab500ad71553539d64f7cd10d0..052c292eeda61b798f8c58ebbf04efd36b0fca2f 100644 (file)
--- a/drivers/soc/qcom/pmic_glink.c
+++ b/drivers/soc/qcom/pmic_glink.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2022, Linaro Ltd
  */
 #include <linux/auxiliary_bus.h>
+#include <linux/cleanup.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -100,15 +101,13 @@ void pmic_glink_client_register(struct pmic_glink_client *client)
        struct pmic_glink *pg = client->pg;
        unsigned long flags;
 
-       mutex_lock(&pg->state_lock);
+       guard(mutex)(&pg->state_lock);
        spin_lock_irqsave(&pg->client_lock, flags);
 
        list_add(&client->node, &pg->clients);
        client->pdr_notify(client->priv, pg->client_state);
 
        spin_unlock_irqrestore(&pg->client_lock, flags);
-       mutex_unlock(&pg->state_lock);
-
 }
 EXPORT_SYMBOL_GPL(pmic_glink_client_register);
 
@@ -119,26 +118,25 @@ int pmic_glink_send(struct pmic_glink_client *client, void *data, size_t len)
        unsigned long start;
        int ret;
 
-       mutex_lock(&pg->state_lock);
+       guard(mutex)(&pg->state_lock);
        if (!pg->ept) {
-               ret = -ECONNRESET;
-       } else {
-               start = jiffies;
-               for (;;) {
-                       ret = rpmsg_send(pg->ept, data, len);
-                       if (ret != -EAGAIN)
-                               break;
-
-                       if (timeout_reached) {
-                               ret = -ETIMEDOUT;
-                               break;
-                       }
-
-                       usleep_range(1000, 5000);
-                       timeout_reached = time_after(jiffies, start + PMIC_GLINK_SEND_TIMEOUT);
+               return -ECONNRESET;
+       }
+
+       start = jiffies;
+       for (;;) {
+               ret = rpmsg_send(pg->ept, data, len);
+               if (ret != -EAGAIN)
+                       break;
+
+               if (timeout_reached) {
+                       ret = -ETIMEDOUT;
+                       break;
                }
+
+               usleep_range(1000, 5000);
+               timeout_reached = time_after(jiffies, start + PMIC_GLINK_SEND_TIMEOUT);
        }
-       mutex_unlock(&pg->state_lock);
 
        return ret;
 }
@@ -227,51 +225,42 @@ static void pmic_glink_pdr_callback(int state, char *svc_path, void *priv)
 {
        struct pmic_glink *pg = priv;
 
-       mutex_lock(&pg->state_lock);
+       guard(mutex)(&pg->state_lock);
        pg->pdr_state = state;
 
        pmic_glink_state_notify_clients(pg);
-       mutex_unlock(&pg->state_lock);
 }
 
 static int pmic_glink_rpmsg_probe(struct rpmsg_device *rpdev)
 {
        struct pmic_glink *pg = __pmic_glink;
-       int ret = 0;
 
-       mutex_lock(&__pmic_glink_lock);
-       if (!pg) {
-               ret = dev_err_probe(&rpdev->dev, -ENODEV, "no pmic_glink device to attach to\n");
-               goto out_unlock;
-       }
+       guard(mutex)(&__pmic_glink_lock);
+       pg = __pmic_glink;
+       if (!pg)
+               return dev_err_probe(&rpdev->dev, -ENODEV, "no pmic_glink device to attach to\n");
 
        dev_set_drvdata(&rpdev->dev, pg);
 
-       mutex_lock(&pg->state_lock);
+       guard(mutex)(&pg->state_lock);
        pg->ept = rpdev->ept;
        pmic_glink_state_notify_clients(pg);
-       mutex_unlock(&pg->state_lock);
 
-out_unlock:
-       mutex_unlock(&__pmic_glink_lock);
-       return ret;
+       return 0;
 }
 
 static void pmic_glink_rpmsg_remove(struct rpmsg_device *rpdev)
 {
        struct pmic_glink *pg;
 
-       mutex_lock(&__pmic_glink_lock);
+       guard(mutex)(&__pmic_glink_lock);
        pg = __pmic_glink;
        if (!pg)
-               goto out_unlock;
+               return;
 
-       mutex_lock(&pg->state_lock);
+       guard(mutex)(&pg->state_lock);
        pg->ept = NULL;
        pmic_glink_state_notify_clients(pg);
-       mutex_unlock(&pg->state_lock);
-out_unlock:
-       mutex_unlock(&__pmic_glink_lock);
 }
 
 static const struct rpmsg_device_id pmic_glink_rpmsg_id_match[] = {
@@ -378,9 +367,8 @@ static void pmic_glink_remove(struct platform_device *pdev)
        if (pg->client_mask & BIT(PMIC_GLINK_CLIENT_UCSI))
                pmic_glink_del_aux_device(pg, &pg->ucsi_aux);
 
-       mutex_lock(&__pmic_glink_lock);
+       guard(mutex)(&__pmic_glink_lock);
        __pmic_glink = NULL;
-       mutex_unlock(&__pmic_glink_lock);
 }
 
 static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |