platform/x86/amd: pmf: Simplify error flow in amd_pmf_init_smart_pc()

commit 5b1122fc4995f ("platform/x86/amd/pmf: fix cleanup in
amd_pmf_init_smart_pc()") adjusted the error handling flow to use a ladder
but this isn't actually needed because work is only scheduled in
amd_pmf_start_policy_engine() and with device managed cleanups pointers
for allocations don't need to be freed.

Adjust the error flow to a single call to amd_pmf_deinit_smart_pc() for
the cases that need to clean up.

Cc: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20250512211154.2510397-4-superm1@kernel.org
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20250522003457.1516679-4-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/tee-if.c b/drivers/platform/x86/amd/pmf/tee-if.c
index 76efce48a45ce2aa180d7f8794b161cc5b096313..4f626ebcb619736e8856a8b078d108e31109fe32 100644 (file)
--- a/drivers/platform/x86/amd/pmf/tee-if.c
+++ b/drivers/platform/x86/amd/pmf/tee-if.c
@@ -530,64 +530,45 @@ int amd_pmf_init_smart_pc(struct amd_pmf_dev *dev)
 
        ret = amd_pmf_set_dram_addr(dev, true);
        if (ret)
-               goto err_cancel_work;
+               return ret;
 
        dev->policy_base = devm_ioremap_resource(dev->dev, dev->res);
-       if (IS_ERR(dev->policy_base)) {
-               ret = PTR_ERR(dev->policy_base);
-               goto err_cancel_work;
-       }
+       if (IS_ERR(dev->policy_base))
+               return PTR_ERR(dev->policy_base);
 
        dev->policy_buf = devm_kzalloc(dev->dev, dev->policy_sz, GFP_KERNEL);
-       if (!dev->policy_buf) {
-               ret = -ENOMEM;
-               goto err_cancel_work;
-       }
+       if (!dev->policy_buf)
+               return -ENOMEM;
 
        memcpy_fromio(dev->policy_buf, dev->policy_base, dev->policy_sz);
 
        if (!amd_pmf_pb_valid(dev)) {
                dev_info(dev->dev, "No Smart PC policy present\n");
-               ret = -EINVAL;
-               goto err_cancel_work;
+               return -EINVAL;
        }
 
        amd_pmf_hex_dump_pb(dev);
 
        dev->prev_data = devm_kzalloc(dev->dev, sizeof(*dev->prev_data), GFP_KERNEL);
-       if (!dev->prev_data) {
-               ret = -ENOMEM;
-               goto err_cancel_work;
-       }
+       if (!dev->prev_data)
+               return -ENOMEM;
 
        for (i = 0; i < ARRAY_SIZE(amd_pmf_ta_uuid); i++) {
                ret = amd_pmf_tee_init(dev, &amd_pmf_ta_uuid[i]);
                if (ret)
-                       goto err_cancel_work;
+                       return ret;
 
                ret = amd_pmf_start_policy_engine(dev);
-               switch (ret) {
-               case TA_PMF_TYPE_SUCCESS:
-                       status = true;
-                       break;
-               case TA_ERROR_CRYPTO_INVALID_PARAM:
-               case TA_ERROR_CRYPTO_BIN_TOO_LARGE:
-                       amd_pmf_tee_deinit(dev);
-                       status = false;
-                       break;
-               default:
-                       ret = -EINVAL;
-                       amd_pmf_tee_deinit(dev);
-                       goto err_cancel_work;
-               }
-
+               dev_dbg(dev->dev, "start policy engine ret: %d\n", ret);
+               status = ret == TA_PMF_TYPE_SUCCESS;
                if (status)
                        break;
+               amd_pmf_tee_deinit(dev);
        }
 
        if (!status && !pb_side_load) {
                ret = -EINVAL;
-               goto err_cancel_work;
+               goto err;
        }
 
        if (pb_side_load)
@@ -595,16 +576,12 @@ int amd_pmf_init_smart_pc(struct amd_pmf_dev *dev)
 
        ret = amd_pmf_register_input_device(dev);
        if (ret)
-               goto err_pmf_remove_pb;
+               goto err;
 
        return 0;
 
-err_pmf_remove_pb:
-       if (pb_side_load && dev->esbin)
-               amd_pmf_remove_pb(dev);
-       amd_pmf_tee_deinit(dev);
-err_cancel_work:
-       cancel_delayed_work_sync(&dev->pb_work);
+err:
+       amd_pmf_deinit_smart_pc(dev);
 
        return ret;
 }