Skip to content

Commit

Permalink
remoteproc: Rename function rproc_actuate()
Browse files Browse the repository at this point in the history
Rename function rproc_actuate() to rproc_attach().  That way it is
easy to understand that it does the opposite of rproc_detach().

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Link: https://lore.kernel.org/r/20210312162453.1234145-3-mathieu.poirier@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  • Loading branch information
mathieupoirier authored and andersson committed Mar 18, 2021
1 parent 16324fc commit 6a6c4dc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/remoteproc/remoteproc_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1422,7 +1422,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;
Expand Down Expand Up @@ -1547,7 +1547,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;
Expand Down Expand Up @@ -1587,7 +1587,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;

Expand Down Expand Up @@ -1808,7 +1808,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);

Expand Down

0 comments on commit 6a6c4dc

Please sign in to comment.