Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ca7d866 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

remoteproc: Remove custom vdev handler list 



The vdev handler is now just another resource allocator, so handle all
resource types in a single pass.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 48f18f89

drivers/remoteproc/remoteproc_core.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -731,10 +731,6 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = { 
	[RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout,

	[RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout,

	[RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem,

	[RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem,

	[RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace,

	[RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace,

	[RSC_VDEV] = NULL,

};



static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = {

	[RSC_VDEV] = (rproc_handle_resource_t)rproc_handle_vdev,

	[RSC_VDEV] = (rproc_handle_resource_t)rproc_handle_vdev,

};

};
@@ -905,13 +901,6 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) 
	/* reset max_notifyid */

	/* reset max_notifyid */

	rproc->max_notifyid = -1;

	rproc->max_notifyid = -1;





	/* look for virtio devices and register them */

	ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler);

	if (ret) {

		dev_err(dev, "Failed to handle vdev resources: %d\n", ret);

		goto clean_up;

	}



	/* handle fw resources which are required to boot rproc */

	/* handle fw resources which are required to boot rproc */

	ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);

	ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);

	if (ret) {

	if (ret) {