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: [RFC PATCH 03/13] of: Remove braces around single line blocks.
Date: Tue, 25 Oct 2016 13:58:56 -0700 [thread overview]
Message-ID: <1477429146-27039-4-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1477429146-27039-1-git-send-email-frowand.list@gmail.com>
From: Frank Rowand <frank.rowand@am.sony.com>
The single line blocks were created by previous patches in the series.
Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
---
drivers/of/resolver.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 93a7ca0bf98c..c61ba99a1792 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -115,9 +115,8 @@ static int __of_adjust_phandle_ref(struct device_node *node,
int err = 0;
propval = kmalloc(rprop->length, GFP_KERNEL);
- if (!propval) {
+ if (!propval)
return -ENOMEM;
- }
memcpy(propval, rprop->value, rprop->length);
propend = propval + rprop->length;
@@ -141,14 +140,12 @@ static int __of_adjust_phandle_ref(struct device_node *node,
*s++ = '\0';
err = kstrtoint(s, 10, &offset);
- if (err != 0) {
+ if (err != 0)
goto err_fail;
- }
refnode = __of_find_node_by_full_name(node, nodestr);
- if (!refnode) {
+ if (!refnode)
continue;
- }
for_each_property_of_node(refnode, sprop) {
if (of_prop_cmp(sprop->name, propstr) == 0)
@@ -207,9 +204,8 @@ static int __of_adjust_tree_phandle_references(struct device_node *node,
of_prop_cmp(rprop->name, "linux,phandle") == 0)
continue;
- if ((rprop->length % 4) != 0 || rprop->length == 0) {
+ if ((rprop->length % 4) != 0 || rprop->length == 0)
return -EINVAL;
- }
count = rprop->length / sizeof(__be32);
for_each_property_of_node(target, sprop) {
@@ -217,16 +213,13 @@ static int __of_adjust_tree_phandle_references(struct device_node *node,
break;
}
- if (sprop == NULL) {
+ if (sprop == NULL)
return -EINVAL;
- }
for (i = 0; i < count; i++) {
off = be32_to_cpu(((__be32 *)rprop->value)[i]);
- if (off >= sprop->length ||
- (off + 4) > sprop->length) {
+ if (off >= sprop->length || (off + 4) > sprop->length)
return -EINVAL;
- }
if (phandle_delta) {
phandle = be32_to_cpu(*(__be32 *)(sprop->value + off));
@@ -242,9 +235,8 @@ static int __of_adjust_tree_phandle_references(struct device_node *node,
if (__of_node_name_cmp(child, childtarget) == 0)
break;
- if (!childtarget) {
+ if (!childtarget)
return -EINVAL;
- }
err = __of_adjust_tree_phandle_references(child, childtarget,
phandle_delta);
@@ -342,9 +334,8 @@ int of_resolve_phandles(struct device_node *resolve)
err = of_property_read_string(root_sym,
rprop->name, &refpath);
- if (err != 0) {
+ if (err != 0)
goto out;
- }
refnode = of_find_node_by_path(refpath);
if (!refnode) {
--
1.9.1
next prev parent reply other threads:[~2016-10-25 20:58 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 20:58 [RFC PATCH 00/13] of: Make drivers/of/resolver.c more readable frowand.list-Re5JQEeQqe8AvxtiuMwx3w
2016-10-25 20:58 ` [RFC PATCH 01/13] of: Remove comments that state the obvious frowand.list
[not found] ` <1477429146-27039-2-git-send-email-frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-25 21:29 ` Joe Perches
2016-10-27 12:18 ` Rob Herring
[not found] ` <CAL_JsqL1aPq3rJLngvpQav-4-AKBd+u=+GX5NNpP9Kbc4zehpw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-10-27 16:02 ` Frank Rowand
2016-10-25 20:58 ` [RFC PATCH 02/13] of: Remove excessive printks to reduce clutter frowand.list
2016-10-27 12:21 ` Rob Herring
2016-10-27 13:51 ` Pantelis Antoniou
2016-10-27 16:09 ` Frank Rowand
2016-10-27 16:04 ` Frank Rowand
2016-10-25 20:58 ` frowand.list [this message]
2016-10-25 20:58 ` [RFC PATCH 05/13] of: Rename functions to more accurately reflect what they do frowand.list
2016-10-25 20:58 ` [RFC PATCH 06/13] of: Remove prefix "__of_" and prefix "__" from local function names frowand.list
2016-10-27 12:47 ` Rob Herring
[not found] ` <CAL_JsqL9KWw7Mkz8nwZWDot+3OPBC2AesYuvu3dEofiB7BGeGQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-10-27 16:35 ` Frank Rowand
[not found] ` <58122CC0.3090700-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-27 16:58 ` Rob Herring
2016-10-27 18:25 ` Frank Rowand
2016-10-27 20:20 ` Rob Herring
2016-10-25 20:59 ` [RFC PATCH 09/13] of: Remove redundant size check frowand.list
2016-10-25 20:59 ` [RFC PATCH 10/13] of: Update comments to reflect changes and increase clarity frowand.list
2016-10-25 20:59 ` [RFC PATCH 11/13] of: Add back an error message, restructured frowand.list
2016-10-25 20:59 ` [RFC PATCH 12/13] of: Move setting of pointer to beside test for non-null frowand.list
[not found] ` <1477429146-27039-1-git-send-email-frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-25 20:58 ` [RFC PATCH 04/13] of: Convert comparisons to zero or NULL to simplify logical expressions frowand.list-Re5JQEeQqe8AvxtiuMwx3w
2016-10-25 20:59 ` [RFC PATCH 07/13] of: Rename variables to better reflect purpose or follow convention frowand.list-Re5JQEeQqe8AvxtiuMwx3w
2016-10-25 20:59 ` [RFC PATCH 08/13] of: Update structure of code, remove BUG_ON() frowand.list-Re5JQEeQqe8AvxtiuMwx3w
2016-10-25 20:59 ` [RFC PATCH 13/13] of: Remove unused variable overlay_symbols frowand.list-Re5JQEeQqe8AvxtiuMwx3w
2016-10-27 14:41 ` Pantelis Antoniou
2016-10-27 16:27 ` Frank Rowand
[not found] ` <58122AF9.3040709-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-27 16:53 ` Frank Rowand
[not found] ` <58123122.8020908-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-27 16:57 ` Frank Rowand
2016-10-25 21:02 ` [RFC PATCH 00/13] of: Make drivers/of/resolver.c more readable Frank Rowand
2016-10-27 12:03 ` Rob Herring
[not found] ` <CAL_JsqKX4nahQ4o1FtPLfqqbYM2-pm9QbsobaaRzo8z7arJEjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-10-27 16:36 ` Frank Rowand
2016-10-27 13:46 ` Pantelis Antoniou
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=1477429146-27039-4-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).