Commit 1b0ef906 authored by Suman Anna's avatar Suman Anna Committed by Bjorn Andersson
Browse files

remoteproc: Merge __rproc_boot() with rproc_boot() 



The additional arguments in the internal __rproc_boot() function
were dropped in commit 2bfc311a ("remoteproc: Drop wait in
__rproc_boot()"). The exported rproc_boot() is now just a wrapper
around this internal function, so merge them together.

While at this, also remove the declaration for the previously
cleaned up rproc_boot_nowait() function.

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 5771a8c0

drivers/remoteproc/remoteproc_core.c

+2 −11
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ static void rproc_crash_handler_work(struct work_struct *work) 
}



/**

 * __rproc_boot() - boot a remote processor

 * rproc_boot() - boot a remote processor

 * @rproc: handle of a remote processor

 *

 * Boot a remote processor (i.e. load its firmware, power it on, ...).
@@ -1129,7 +1129,7 @@ static void rproc_crash_handler_work(struct work_struct *work) 
 *

 * Returns 0 on success, and an appropriate error value otherwise.

 */

static int __rproc_boot(struct rproc *rproc)

int rproc_boot(struct rproc *rproc)

{

	const struct firmware *firmware_p;

	struct device *dev;
@@ -1180,15 +1180,6 @@ unlock_mutex: 
	mutex_unlock(&rproc->lock);

	return ret;

}



/**

 * rproc_boot() - boot a remote processor

 * @rproc: handle of a remote processor

 */

int rproc_boot(struct rproc *rproc)

{

	return __rproc_boot(rproc);

}

EXPORT_SYMBOL(rproc_boot);



/**

drivers/remoteproc/remoteproc_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct rproc_fw_ops { 
/* from remoteproc_core.c */

void rproc_release(struct kref *kref);

irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id);

int rproc_boot_nowait(struct rproc *rproc);

void rproc_vdev_release(struct kref *ref);



/* from remoteproc_virtio.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE