aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2016-08-04 05:21:46 -0400
committerBjorn Andersson <bjorn.andersson@linaro.org>2016-08-10 13:46:10 -0400
commit353861660aa2e4453df416879f48478a09427510 (patch)
tree9edba22daccbec46db29cc7eb374a8c1669630c5
parent9c219b2337b87108cc57acf93e31ce1ab0e8013e (diff)
remoteproc: core: Trivial: Improve error checking, spelling and debug prints
Trivial patch to clean up a couple of minor misgivings. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-rw-r--r--drivers/remoteproc/remoteproc_core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1b79692e863c..383654c70b82 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -455,8 +455,8 @@ static int rproc_handle_trace(struct rproc *rproc, struct fw_rsc_trace *rsc,
455 455
456 rproc->num_traces++; 456 rproc->num_traces++;
457 457
458 dev_dbg(dev, "%s added: va %p, da 0x%x, len 0x%x\n", name, ptr, 458 dev_dbg(dev, "%s added: va %p, da 0x%x, len 0x%x\n",
459 rsc->da, rsc->len); 459 name, ptr, rsc->da, rsc->len);
460 460
461 return 0; 461 return 0;
462} 462}
@@ -579,8 +579,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
579 return -EINVAL; 579 return -EINVAL;
580 } 580 }
581 581
582 dev_dbg(dev, "carveout rsc: da %x, pa %x, len 0x%x, flags %x\n", 582 dev_dbg(dev, "carveout rsc: name: %s, da %x, pa %x, len 0x%x, flags %x\n",
583 rsc->da, rsc->pa, rsc->len, rsc->flags); 583 rsc->name, rsc->da, rsc->pa, rsc->len, rsc->flags);
584 584
585 carveout = kzalloc(sizeof(*carveout), GFP_KERNEL); 585 carveout = kzalloc(sizeof(*carveout), GFP_KERNEL);
586 if (!carveout) 586 if (!carveout)
@@ -698,7 +698,7 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = {
698 [RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout, 698 [RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout,
699 [RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem, 699 [RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem,
700 [RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace, 700 [RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace,
701 [RSC_VDEV] = NULL, /* VDEVs were handled upon registrarion */ 701 [RSC_VDEV] = NULL, /* VDEVs were handled upon registration */
702}; 702};
703 703
704static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = { 704static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = {
@@ -916,7 +916,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
916 * Create a copy of the resource table. When a virtio device starts 916 * Create a copy of the resource table. When a virtio device starts
917 * and calls vring_new_virtqueue() the address of the allocated vring 917 * and calls vring_new_virtqueue() the address of the allocated vring
918 * will be stored in the cached_table. Before the device is started, 918 * will be stored in the cached_table. Before the device is started,
919 * cached_table will be copied into devic memory. 919 * cached_table will be copied into device memory.
920 */ 920 */
921 rproc->cached_table = kmemdup(table, tablesz, GFP_KERNEL); 921 rproc->cached_table = kmemdup(table, tablesz, GFP_KERNEL);
922 if (!rproc->cached_table) 922 if (!rproc->cached_table)