提交 5d05b811 编写于 作者: B Baruch Siach 提交者: Rob Herring

of: base: Improve argument length mismatch error

The cells_name field of of_phandle_iterator might be NULL. Use the
phandle name instead. With this change instead of:

  OF: /soc/pinctrl@1000000: (null) = 3 found 2

We get:

  OF: /soc/pinctrl@1000000: phandle pinctrl@1000000 needs 3, found 2

Which is a more helpful messages making DT debugging easier.

In this particular example the phandle name looks like duplicate of the
same node name. But note that the first node is the parent node
(it->parent), while the second is the phandle target (it->node). They
happen to be the same in the case that triggered this improvement. See
commit 72cb4c48 ("arm64: dts: qcom: ipq6018: Fix gpio-ranges
property").
Signed-off-by: NBaruch Siach <baruch@tkos.co.il>
Signed-off-by: NRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/f6a68e0088a552ea9dfd4d8e3b5b586d92594738.1640881913.git.baruch@tkos.co.il
上级 94a4950a
...@@ -1376,9 +1376,14 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it) ...@@ -1376,9 +1376,14 @@ int of_phandle_iterator_next(struct of_phandle_iterator *it)
* property data length * property data length
*/ */
if (it->cur + count > it->list_end) { if (it->cur + count > it->list_end) {
if (it->cells_name)
pr_err("%pOF: %s = %d found %td\n", pr_err("%pOF: %s = %d found %td\n",
it->parent, it->cells_name, it->parent, it->cells_name,
count, it->list_end - it->cur); count, it->list_end - it->cur);
else
pr_err("%pOF: phandle %s needs %d, found %td\n",
it->parent, of_node_full_name(it->node),
count, it->list_end - it->cur);
goto err; goto err;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册