Align what was done for rproc_detach() by renaming function
rproc_actuate(). That way it is easier to figure out the
opposite of each functions.
Signed-off-by: Mathieu Poirier <[email protected]>
---
drivers/remoteproc/remoteproc_core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index f3943a1e2754..c4b80ce6f22d 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1393,7 +1393,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
return ret;
}
-static int rproc_attach(struct rproc *rproc)
+static int __rproc_attach(struct rproc *rproc)
{
struct device *dev = &rproc->dev;
int ret;
@@ -1518,7 +1518,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
* Attach to remote processor - similar to rproc_fw_boot() but without
* the steps that deal with the firmware image.
*/
-static int rproc_actuate(struct rproc *rproc)
+static int rproc_attach(struct rproc *rproc)
{
struct device *dev = &rproc->dev;
int ret;
@@ -1558,7 +1558,7 @@ static int rproc_actuate(struct rproc *rproc)
goto clean_up_resources;
}
- ret = rproc_attach(rproc);
+ ret = __rproc_attach(rproc);
if (ret)
goto clean_up_resources;
@@ -1802,7 +1802,7 @@ int rproc_boot(struct rproc *rproc)
if (rproc->state == RPROC_DETACHED) {
dev_info(dev, "attaching to %s\n", rproc->name);
- ret = rproc_actuate(rproc);
+ ret = rproc_attach(rproc);
} else {
dev_info(dev, "powering up %s\n", rproc->name);
@@ -1893,7 +1893,7 @@ EXPORT_SYMBOL(rproc_shutdown);
*
* @rproc: the remote processor
*
- * Detach a remote processor (previously attached to with rproc_actuate()).
+ * Detach a remote processor (previously attached to with rproc_attach()).
*
* In case @rproc is still being used by an additional user(s), then
* this function will just decrement the power refcount and exit,
--
2.25.1
> Subject: [PATCH 08/13] remoteproc: Rename function rproc_actuate()
>
> Align what was done for rproc_detach() by renaming function rproc_actuate().
> That way it is easier to figure out the opposite of each functions.
>
> Signed-off-by: Mathieu Poirier <[email protected]>
> ---
> drivers/remoteproc/remoteproc_core.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c
> b/drivers/remoteproc/remoteproc_core.c
> index f3943a1e2754..c4b80ce6f22d 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -1393,7 +1393,7 @@ static int rproc_start(struct rproc *rproc, const
> struct firmware *fw)
> return ret;
> }
>
> -static int rproc_attach(struct rproc *rproc)
> +static int __rproc_attach(struct rproc *rproc)
> {
> struct device *dev = &rproc->dev;
> int ret;
> @@ -1518,7 +1518,7 @@ static int rproc_fw_boot(struct rproc *rproc, const
> struct firmware *fw)
> * Attach to remote processor - similar to rproc_fw_boot() but without
> * the steps that deal with the firmware image.
> */
> -static int rproc_actuate(struct rproc *rproc)
> +static int rproc_attach(struct rproc *rproc)
> {
> struct device *dev = &rproc->dev;
> int ret;
> @@ -1558,7 +1558,7 @@ static int rproc_actuate(struct rproc *rproc)
> goto clean_up_resources;
> }
>
> - ret = rproc_attach(rproc);
> + ret = __rproc_attach(rproc);
> if (ret)
> goto clean_up_resources;
>
> @@ -1802,7 +1802,7 @@ int rproc_boot(struct rproc *rproc)
> if (rproc->state == RPROC_DETACHED) {
> dev_info(dev, "attaching to %s\n", rproc->name);
>
> - ret = rproc_actuate(rproc);
> + ret = rproc_attach(rproc);
> } else {
> dev_info(dev, "powering up %s\n", rproc->name);
>
> @@ -1893,7 +1893,7 @@ EXPORT_SYMBOL(rproc_shutdown);
> *
> * @rproc: the remote processor
> *
> - * Detach a remote processor (previously attached to with rproc_actuate()).
> + * Detach a remote processor (previously attached to with rproc_attach()).
> *
> * In case @rproc is still being used by an additional user(s), then
> * this function will just decrement the power refcount and exit,
> --
Reviewed-by: Peng Fan <[email protected]>