From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Sun, 20 Nov 2016 06:42:55 +0000 (-0800)
Subject: remoteproc: Update last rproc_put users to rproc_free
X-Git-Tag: v4.10-rc1~163^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90a80d88d2aac41f658ae4260ea259a292f95cb1;p=thirdparty%2Fkernel%2Flinux.git

remoteproc: Update last rproc_put users to rproc_free

The transition from rproc_put to rproc_free raced with the review of the
Qualcomm ADSP and ST SLIMproc drivers and these where not updated
accordingly.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index cec09911384f1..43a4ed2f346cf 100644
--- a/drivers/remoteproc/qcom_adsp_pil.c
+++ b/drivers/remoteproc/qcom_adsp_pil.c
@@ -391,7 +391,7 @@ static int adsp_probe(struct platform_device *pdev)
 	return 0;
 
 free_rproc:
-	rproc_put(rproc);
+	rproc_free(rproc);
 
 	return ret;
 }
@@ -402,7 +402,7 @@ static int adsp_remove(struct platform_device *pdev)
 
 	qcom_smem_state_put(adsp->state);
 	rproc_del(adsp->rproc);
-	rproc_put(adsp->rproc);
+	rproc_free(adsp->rproc);
 
 	return 0;
 }
diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c
index 1484e97179469..507716c8721fd 100644
--- a/drivers/remoteproc/st_slim_rproc.c
+++ b/drivers/remoteproc/st_slim_rproc.c
@@ -330,7 +330,7 @@ err_clk_put:
 	for (i = 0; i < ST_SLIM_MAX_CLK && slim_rproc->clks[i]; i++)
 		clk_put(slim_rproc->clks[i]);
 err:
-	rproc_put(rproc);
+	rproc_free(rproc);
 	return ERR_PTR(err);
 }
 EXPORT_SYMBOL(st_slim_rproc_alloc);
@@ -355,7 +355,7 @@ void st_slim_rproc_put(struct st_slim_rproc *slim_rproc)
 		clk_put(slim_rproc->clks[clk]);
 
 	rproc_del(slim_rproc->rproc);
-	rproc_put(slim_rproc->rproc);
+	rproc_free(slim_rproc->rproc);
 }
 EXPORT_SYMBOL(st_slim_rproc_put);