remoteproc: k3: Call of_node_put(rmem_np) only once in three functions
[ Upstream commit a36d9f96d1cf7c0308bf091e810bec06ce492c3d ] An of_node_put(rmem_np) call was immediately used after a pointer check for a of_reserved_mem_lookup() call in three function implementations. Thus call such a function only once instead directly before the checks. This issue was transformed by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Link: https://lore.kernel.org/r/c46b06f9-72b1-420b-9dce-a392b982140e@web.de Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Stable-dep-of: 701177511abd ("remoteproc: k3-r5: Refactor sequential core power up/down operations") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
5b6eb04c05
commit
5eec92eb4f
@@ -568,11 +568,9 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
|
||||
return -EINVAL;
|
||||
|
||||
rmem = of_reserved_mem_lookup(rmem_np);
|
||||
if (!rmem) {
|
||||
of_node_put(rmem_np);
|
||||
return -EINVAL;
|
||||
}
|
||||
of_node_put(rmem_np);
|
||||
if (!rmem)
|
||||
return -EINVAL;
|
||||
|
||||
kproc->rmem[i].bus_addr = rmem->base;
|
||||
/* 64-bit address regions currently not supported */
|
||||
|
||||
@@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct k3_m4_rproc *kproc)
|
||||
return -EINVAL;
|
||||
|
||||
rmem = of_reserved_mem_lookup(rmem_np);
|
||||
if (!rmem) {
|
||||
of_node_put(rmem_np);
|
||||
return -EINVAL;
|
||||
}
|
||||
of_node_put(rmem_np);
|
||||
if (!rmem)
|
||||
return -EINVAL;
|
||||
|
||||
kproc->rmem[i].bus_addr = rmem->base;
|
||||
/* 64-bit address regions currently not supported */
|
||||
|
||||
@@ -993,12 +993,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
|
||||
}
|
||||
|
||||
rmem = of_reserved_mem_lookup(rmem_np);
|
||||
of_node_put(rmem_np);
|
||||
if (!rmem) {
|
||||
of_node_put(rmem_np);
|
||||
ret = -EINVAL;
|
||||
goto unmap_rmem;
|
||||
}
|
||||
of_node_put(rmem_np);
|
||||
|
||||
kproc->rmem[i].bus_addr = rmem->base;
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user