From: frowand.list@gmail.com
To: Rob Herring <robh+dt@kernel.org>,
pantelis.antoniou@konsulko.com,
Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 10/12] of: Add back an error message, restructured
Date: Fri, 28 Oct 2016 23:26:30 -0700 [thread overview]
Message-ID: <1477722392-32172-11-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1477722392-32172-1-git-send-email-frowand.list@gmail.com>
From: Frank Rowand <frank.rowand@am.sony.com>
Add a single pr_err() to cover a range of errors that were reported
by several pr_err() that were removed earlier in this series.
Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
---
drivers/of/resolver.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index f842dbd1585c..eb78010c21a3 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -293,13 +293,17 @@ int of_resolve_phandles(struct device_node *overlay)
phandle phandle, phandle_delta;
int err;
+ tree_symbols = NULL;
+
if (!overlay) {
pr_err("null overlay\n");
- return -EINVAL;
+ err = -EINVAL;
+ goto err_out;
}
if (!of_node_check_flag(overlay, OF_DETACHED)) {
pr_err("overlay not detached\n");
- return -EINVAL;
+ err = -EINVAL;
+ goto err_out;
}
phandle_delta = live_tree_max_phandle() + 1;
@@ -311,7 +315,7 @@ int of_resolve_phandles(struct device_node *overlay)
err = adjust_local_phandle_references(local_fixups, overlay, phandle_delta);
if (err)
- return err;
+ goto err_out;
overlay_symbols = NULL;
overlay_fixups = NULL;
@@ -333,7 +337,7 @@ int of_resolve_phandles(struct device_node *overlay)
if (!tree_symbols) {
pr_err("no symbols in root of device tree.\n");
err = -EINVAL;
- goto out;
+ goto err_out;
}
for_each_property_of_node(overlay_fixups, prop) {
@@ -345,12 +349,12 @@ int of_resolve_phandles(struct device_node *overlay)
err = of_property_read_string(tree_symbols,
prop->name, &refpath);
if (err)
- goto out;
+ goto err_out;
refnode = of_find_node_by_path(refpath);
if (!refnode) {
err = -ENOENT;
- goto out;
+ goto err_out;
}
phandle = refnode->phandle;
@@ -361,6 +365,8 @@ int of_resolve_phandles(struct device_node *overlay)
break;
}
+err_out:
+ pr_err("overlay phandle fixup failed: %d\n", err);
out:
of_node_put(tree_symbols);
--
1.9.1
next prev parent reply other threads:[~2016-10-29 6:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-29 6:26 [PATCH 00/12] of: Make drivers/of/resolver.c more readable frowand.list-Re5JQEeQqe8AvxtiuMwx3w
2016-10-29 6:26 ` [PATCH 01/12] of: Remove comments that state the obvious, to reduce clutter frowand.list
2016-10-29 6:26 ` [PATCH 02/12] of: Remove excessive printks " frowand.list
2016-10-29 6:26 ` [PATCH 03/12] of: Convert comparisons to zero or NULL to logical expressions frowand.list
2016-10-29 6:26 ` [PATCH 04/12] of: Rename functions to more accurately reflect what they do frowand.list
2016-10-29 6:26 ` [PATCH 05/12] of: Remove prefix "__of_" from local function names frowand.list
2016-10-29 6:26 ` [PATCH 06/12] of: Rename variables to better reflect purpose or follow convention frowand.list
2016-10-29 6:26 ` [PATCH 07/12] of: Update structure of code to be clearer, also remove BUG_ON() frowand.list
2016-10-29 6:26 ` [PATCH 08/12] of: Remove redundant size check frowand.list
2016-10-29 6:26 ` [PATCH 09/12] of: Update comments to reflect changes and increase clarity frowand.list
2016-10-29 6:26 ` frowand.list [this message]
2016-10-29 6:26 ` [PATCH 11/12] of: Move setting of pointer to beside test for non-null frowand.list
2016-10-29 6:26 ` [PATCH 12/12] of: Remove unused variable overlay_symbols frowand.list
2016-11-10 20:56 ` [PATCH 00/12] of: Make drivers/of/resolver.c more readable Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477722392-32172-11-git-send-email-frowand.list@gmail.com \
--to=frowand.list@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pantelis.antoniou@konsulko.com \
--cc=panto@antoniou-consulting.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).