p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iommu: pass cell_count = -1 to of_for_each_phandle with cells_name 

Currently of_for_each_phandle ignores the cell_count parameter when a
cells_name is given. I intend to change that and let the iterator fall
back to a non-negative cell_count if the cells_name property is missing
in the referenced node.

To not change how existing of_for_each_phandle's users iterate, fix them
to pass cell_count = -1 when also cells_name is given which yields the
expected behaviour with and without my change.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Uwe Kleine-König 2019-08-24 15:28:45 +02:00 committed by Rob Herring
parent 693af5f3ee
commit c680e9abaa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/arm-smmu.c
View File

@ -333,7 +333,7 @@ static int __find_legacy_master_phandle(struct device *dev, void *data)
int err; int err;
of_for_each_phandle(it, err, dev->of_node, "mmu-masters", of_for_each_phandle(it, err, dev->of_node, "mmu-masters",
"#stream-id-cells", 0) "#stream-id-cells", -1)
if (it->node == np) { if (it->node == np) {
*(void **)data = dev; *(void **)data = dev;
return 1; return 1;

2
drivers/iommu/mtk_iommu_v1.c
View File

@ -426,7 +426,7 @@ static int mtk_iommu_add_device(struct device *dev)
int err; int err;
of_for_each_phandle(&it, err, dev->of_node, "iommus", of_for_each_phandle(&it, err, dev->of_node, "iommus",
"#iommu-cells", 0) { "#iommu-cells", -1) {
int count = of_phandle_iterator_args(&it, iommu_spec.args, int count = of_phandle_iterator_args(&it, iommu_spec.args,
MAX_PHANDLE_ARGS); MAX_PHANDLE_ARGS);
iommu_spec.np = of_node_get(it.node); iommu_spec.np = of_node_get(it.node);