platform/x86/amd: pmf: Switch to guard(mutex)

Instead of using the `goto label; mutex_unlock()` pattern use
`guard(mutex)` which will release the mutex when it goes out of scope.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20241217194027.1189038-3-superm1@kernel.org
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
index 21ccd677ffa4f6c08629074575fdd80c243f1613..dd5780a1d06e1dc979fcff5bafd6729bc4937eab 100644 (file)
--- a/drivers/platform/x86/amd/pmf/acpi.c
+++ b/drivers/platform/x86/amd/pmf/acpi.c
@@ -339,11 +339,11 @@ static void apmf_event_handler(acpi_handle handle, u32 event, void *data)
        struct apmf_sbios_req req;
        int ret;
 
-       mutex_lock(&pmf_dev->update_mutex);
+       guard(mutex)(&pmf_dev->update_mutex);
        ret = apmf_get_sbios_requests(pmf_dev, &req);
        if (ret) {
                dev_err(pmf_dev->dev, "Failed to get SBIOS requests:%d\n", ret);
-               goto out;
+               return;
        }
 
        if (req.pending_req & BIT(APMF_AMT_NOTIFICATION)) {
@@ -365,8 +365,6 @@ static void apmf_event_handler(acpi_handle handle, u32 event, void *data)
                if (pmf_dev->amt_enabled)
                        amd_pmf_update_2_cql(pmf_dev, req.cql_event);
        }
-out:
-       mutex_unlock(&pmf_dev->update_mutex);
 }
 
 static int apmf_if_verify_interface(struct amd_pmf_dev *pdev)

diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 01eb9ee1eccd9338788c88f8bcd48df0b59ba1b0..57ee95a327be51e397fdb75226e434d6e2015223 100644 (file)
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -127,7 +127,8 @@ static void amd_pmf_get_metrics(struct work_struct *work)
        ktime_t time_elapsed_ms;
        int socket_power;
 
-       mutex_lock(&dev->update_mutex);
+       guard(mutex)(&dev->update_mutex);
+
        /* Transfer table contents */
        memset(dev->buf, 0, sizeof(dev->m_table));
        amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
@@ -149,7 +150,6 @@ static void amd_pmf_get_metrics(struct work_struct *work)
 
        dev->start_time = ktime_to_ms(ktime_get());
        schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms));
-       mutex_unlock(&dev->update_mutex);
 }
 
 static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
@@ -181,7 +181,7 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32
        int rc;
        u32 val;
 
-       mutex_lock(&dev->lock);
+       guard(mutex)(&dev->lock);
 
        /* Wait until we get a valid response */
        rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMF_REGISTER_RESPONSE,
@@ -189,7 +189,7 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32
                                PMF_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
        if (rc) {
                dev_err(dev->dev, "failed to talk to SMU\n");
-               goto out_unlock;
+               return rc;
        }
 
        /* Write zero to response register */
@@ -207,7 +207,7 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32
                                PMF_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
        if (rc) {
                dev_err(dev->dev, "SMU response timed out\n");
-               goto out_unlock;
+               return rc;
        }
 
        switch (val) {
@@ -221,21 +221,19 @@ int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32
        case AMD_PMF_RESULT_CMD_REJECT_BUSY:
                dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val);
                rc = -EBUSY;
-               goto out_unlock;
+               break;
        case AMD_PMF_RESULT_CMD_UNKNOWN:
                dev_err(dev->dev, "SMU cmd unknown. err: 0x%x\n", val);
                rc = -EINVAL;
-               goto out_unlock;
+               break;
        case AMD_PMF_RESULT_CMD_REJECT_PREREQ:
        case AMD_PMF_RESULT_FAILED:
        default:
                dev_err(dev->dev, "SMU cmd failed. err: 0x%x\n", val);
                rc = -EIO;
-               goto out_unlock;
+               break;
        }
 
-out_unlock:
-       mutex_unlock(&dev->lock);
        amd_pmf_dump_registers(dev);
        return rc;
 }