[PATCH v5 14/19] remoteproc: Add return value to function rproc_shutdown()

[Mathieu Poirier]

Add a return value to function rproc_shutdown() in order to
properly deal with error conditions that may occur.

Signed-off-by: Mathieu Poirier <mathieu.poir...@linaro.org>
Reviewed-by: Peng Fan <peng....@nxp.com>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliq...@st.com>
---
 drivers/remoteproc/remoteproc_core.c | 19 ++++++++++++++-----
 include/linux/remoteproc.h           |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_core.c 
b/drivers/remoteproc/remoteproc_core.c
index 9a77cb6d6470..62f708662052 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1966,7 +1966,7 @@ EXPORT_SYMBOL(rproc_boot);
  *   returns, and users can still use it with a subsequent rproc_boot(), if
  *   needed.
  */
-void rproc_shutdown(struct rproc *rproc)
+int rproc_shutdown(struct rproc *rproc)
 {
        struct device *dev = &rproc->dev;
        int ret;
@@ -1974,15 +1974,19 @@ void rproc_shutdown(struct rproc *rproc)
        ret = mutex_lock_interruptible(&rproc->lock);
        if (ret) {
                dev_err(dev, "can't lock rproc %s: %d\n", rproc->name, ret);
-               return;
+               return ret;
        }
 
-       if (rproc->state != RPROC_RUNNING)
+       if (rproc->state != RPROC_RUNNING) {
+               ret = -EPERM;
                goto out;
+       }
 
        /* if the remote proc is still needed, bail out */
-       if (!atomic_dec_and_test(&rproc->power))
+       if (!atomic_dec_and_test(&rproc->power)) {
+               ret = -EBUSY;
                goto out;
+       }
 
        ret = rproc_stop(rproc, false);
        if (ret) {
@@ -1994,7 +1998,11 @@ void rproc_shutdown(struct rproc *rproc)
        rproc_resource_cleanup(rproc);
 
        /* release HW resources if needed */
-       rproc_unprepare_device(rproc);
+       ret = rproc_unprepare_device(rproc);
+       if (ret) {
+               atomic_inc(&rproc->power);
+               goto out;
+       }
 
        rproc_disable_iommu(rproc);
 
@@ -2007,6 +2015,7 @@ void rproc_shutdown(struct rproc *rproc)
        rproc->table_ptr = NULL;
 out:
        mutex_unlock(&rproc->lock);
+       return ret;
 }
 EXPORT_SYMBOL(rproc_shutdown);
 
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index e5f52a12a650..5b49c4018e90 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -664,7 +664,7 @@ rproc_of_resm_mem_entry_init(struct device *dev, u32 
of_resm_idx, size_t len,
                             u32 da, const char *name, ...);
 
 int rproc_boot(struct rproc *rproc);
-void rproc_shutdown(struct rproc *rproc);
+int rproc_shutdown(struct rproc *rproc);
 int rproc_detach(struct rproc *rproc);
 int rproc_set_firmware(struct rproc *rproc, const char *fw_name);
 void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type);
-- 
2.25.1