Merge tag 'rproc-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[sfrench/cifs-2.6.git] / drivers / remoteproc / qcom_q6v5_adsp.c

diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 93f9a1537ec60406ff826715453c02436ca2f65b..1d24c9b656a8299cd46e382a541df60a329cff11 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -674,8 +674,8 @@ static int adsp_probe(struct platform_device *pdev)
                return ret;
        }
 
-       rproc = rproc_alloc(&pdev->dev, pdev->name, &adsp_ops,
-                           firmware_name, sizeof(*adsp));
+       rproc = devm_rproc_alloc(&pdev->dev, pdev->name, &adsp_ops,
+                                firmware_name, sizeof(*adsp));
        if (!rproc) {
                dev_err(&pdev->dev, "unable to allocate remoteproc\n");
                return -ENOMEM;
@@ -700,16 +700,16 @@ static int adsp_probe(struct platform_device *pdev)
 
        ret = adsp_alloc_memory_region(adsp);
        if (ret)
-               goto free_rproc;
+               return ret;
 
        ret = adsp_init_clock(adsp, desc->clk_ids);
        if (ret)
-               goto free_rproc;
+               return ret;
 
        ret = qcom_rproc_pds_attach(adsp, desc->pd_names, desc->num_pds);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to attach proxy power domains\n");
-               goto free_rproc;
+               return ret;
        }
 
        ret = adsp_init_reset(adsp);
@@ -744,9 +744,6 @@ static int adsp_probe(struct platform_device *pdev)
 disable_pm:
        qcom_rproc_pds_detach(adsp);
 
-free_rproc:
-       rproc_free(rproc);
-
        return ret;
 }
 
@@ -761,7 +758,6 @@ static void adsp_remove(struct platform_device *pdev)
        qcom_remove_sysmon_subdev(adsp->sysmon);
        qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev);
        qcom_rproc_pds_detach(adsp);
-       rproc_free(adsp->rproc);
 }
 
 static const struct adsp_pil_data adsp_resource_init = {