superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

of: Simplify of_dma_set_restricted_buffer() to use of_for_each_phandle() 

Simplify of_dma_set_restricted_buffer() by using of_property_present()
and of_for_each_phandle() iterator.

Acked-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20250423-dt-memory-region-v2-v2-2-2fbd6ebd3c88@kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
pull/982/merge
Rob Herring (Arm) 2025-04-23 14:42:14 -05:00
parent f4fcfdda2f
commit df56b2443e
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/of/device.c
View File

@ -35,44 +35,35 @@ EXPORT_SYMBOL(of_match_device);
static void static void
of_dma_set_restricted_buffer(struct device *dev, struct device_node *np) of_dma_set_restricted_buffer(struct device *dev, struct device_node *np)
{ {
struct device_node *node, *of_node = dev->of_node; struct device_node *of_node = dev->of_node;
int count, i; struct of_phandle_iterator it;
int rc, i = 0;
if (!IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL)) if (!IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL))
return; return;
count = of_property_count_elems_of_size(of_node, "memory-region",
sizeof(u32));
/* /*
* If dev->of_node doesn't exist or doesn't contain memory-region, try * If dev->of_node doesn't exist or doesn't contain memory-region, try
* the OF node having DMA configuration. * the OF node having DMA configuration.
*/ */
if (count <= 0) { if (!of_property_present(of_node, "memory-region"))
of_node = np; of_node = np;
count = of_property_count_elems_of_size(
of_node, "memory-region", sizeof(u32));
}
for (i = 0; i < count; i++) { of_for_each_phandle(&it, rc, of_node, "memory-region", NULL, 0) {
node = of_parse_phandle(of_node, "memory-region", i);
/* /*
* There might be multiple memory regions, but only one * There might be multiple memory regions, but only one
* restricted-dma-pool region is allowed. * restricted-dma-pool region is allowed.
*/ */
if (of_device_is_compatible(node, "restricted-dma-pool") && if (of_device_is_compatible(it.node, "restricted-dma-pool") &&
of_device_is_available(node)) { of_device_is_available(it.node)) {
of_node_put(node); if (of_reserved_mem_device_init_by_idx(dev, of_node, i))
dev_warn(dev, "failed to initialise \"restricted-dma-pool\" memory node\n");
of_node_put(it.node);
break; break;
} }
of_node_put(node); i++;
} }
/*
* Attempt to initialize a restricted-dma-pool region if one was found.
* Note that count can hold a negative error code.
*/
if (i < count && of_reserved_mem_device_init_by_idx(dev, of_node, i))
dev_warn(dev, "failed to initialise \"restricted-dma-pool\" memory node\n");
} }
/** /**