Message ID | 20201030195713.1366341-10-mathieu.poirier@linaro.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | remoteproc: Add support for detaching from rproc | expand |
On 10/30/20 8:57 PM, Mathieu Poirier wrote: > 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 <mathieu.poirier@linaro.org> > Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Thanks, Arnaud > --- > 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 6b33a83960d2..de5a5720d1e8 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -1416,7 +1416,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; > @@ -1541,7 +1541,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; > @@ -1581,7 +1581,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; > > @@ -1825,7 +1825,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); > > @@ -1916,7 +1916,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, >
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 6b33a83960d2..de5a5720d1e8 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1416,7 +1416,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; @@ -1541,7 +1541,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; @@ -1581,7 +1581,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; @@ -1825,7 +1825,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); @@ -1916,7 +1916,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,