aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2016-11-20 01:42:55 -0500
committerBjorn Andersson <bjorn.andersson@linaro.org>2016-11-20 01:47:36 -0500
commit90a80d88d2aac41f658ae4260ea259a292f95cb1 (patch)
tree41d1e4ef18e47b8691922f7aa5f7ee4b53f0bf9f
parent6242347226c6540b47c1366aa8faf74ffa5a8b7d (diff)
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>
-rw-r--r--drivers/remoteproc/qcom_adsp_pil.c4
-rw-r--r--drivers/remoteproc/st_slim_rproc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index cec09911384f..43a4ed2f346c 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)
391 return 0; 391 return 0;
392 392
393free_rproc: 393free_rproc:
394 rproc_put(rproc); 394 rproc_free(rproc);
395 395
396 return ret; 396 return ret;
397} 397}
@@ -402,7 +402,7 @@ static int adsp_remove(struct platform_device *pdev)
402 402
403 qcom_smem_state_put(adsp->state); 403 qcom_smem_state_put(adsp->state);
404 rproc_del(adsp->rproc); 404 rproc_del(adsp->rproc);
405 rproc_put(adsp->rproc); 405 rproc_free(adsp->rproc);
406 406
407 return 0; 407 return 0;
408} 408}
diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c
index 1484e9717946..507716c8721f 100644
--- a/drivers/remoteproc/st_slim_rproc.c
+++ b/drivers/remoteproc/st_slim_rproc.c
@@ -330,7 +330,7 @@ err_clk_put:
330 for (i = 0; i < ST_SLIM_MAX_CLK && slim_rproc->clks[i]; i++) 330 for (i = 0; i < ST_SLIM_MAX_CLK && slim_rproc->clks[i]; i++)
331 clk_put(slim_rproc->clks[i]); 331 clk_put(slim_rproc->clks[i]);
332err: 332err:
333 rproc_put(rproc); 333 rproc_free(rproc);
334 return ERR_PTR(err); 334 return ERR_PTR(err);
335} 335}
336EXPORT_SYMBOL(st_slim_rproc_alloc); 336EXPORT_SYMBOL(st_slim_rproc_alloc);
@@ -355,7 +355,7 @@ void st_slim_rproc_put(struct st_slim_rproc *slim_rproc)
355 clk_put(slim_rproc->clks[clk]); 355 clk_put(slim_rproc->clks[clk]);
356 356
357 rproc_del(slim_rproc->rproc); 357 rproc_del(slim_rproc->rproc);
358 rproc_put(slim_rproc->rproc); 358 rproc_free(slim_rproc->rproc);
359} 359}
360EXPORT_SYMBOL(st_slim_rproc_put); 360EXPORT_SYMBOL(st_slim_rproc_put);
361 361