[PATCH v2 1/6] of: Return -EEXIST from of_parse_phandle_with_args for holes in phandle list

Andreas Larsson
2013-01-29T14:55:54Z

Return value for an empty phandle was -EEXIST before commit 15c9a0ac, that
changed the return value in this case to -ENOENT. However, of_gpio_named_count
relies upon the return value to be -EEXIST and relies upon being able to
distinguish this case from the case of no list at all which also returns
-ENOENT.

Also change the of selftest to expect -EEXIST in this case.

Signed-off-by: Andreas Larsson <andreas@gaisler.com>
---

I have only compile tested the selftest, not having appropriate hardware around for running it.

drivers/of/base.c | 4 ++--
drivers/of/selftest.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 2390ddb..986afd7 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1083,11 +1083,11 @@ int of_parse_phandle_with_args(const struct device_node *np, const char *list_na
* All of the error cases above bail out of the loop, so at
* this point, the parsing is successful. If the requested
* index matches, then fill the out_args structure and return,
- * or return -ENOENT for an empty entry.
+ * or return -EEXIST for an empty entry.
*/
if (cur_index == index) {
if (!phandle)
- return -ENOENT;
+ return -EEXIST;

if (out_args) {
int i;
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c
index f24ffd7..b1c2ae9 100644
--- a/drivers/of/selftest.c
+++ b/drivers/of/selftest.c
@@ -54,7 +54,7 @@ static void __init of_selftest_parse_phandle_with_args(void)
passed &= (args.args[1] == 0);
break;
case 2:
- passed &= (rc == -ENOENT);
+ passed &= (rc == -EEXIST);
break;
case 3:
passed &= !rc;
--
1.7.0.4