Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757562AbcLBHLu (ORCPT ); Fri, 2 Dec 2016 02:11:50 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:33937 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbcLBHLs (ORCPT ); Fri, 2 Dec 2016 02:11:48 -0500 Subject: Re: [PATCH v4] of: Fix issue where code would fall through to error case. To: Moritz Fischer , devicetree@vger.kernel.org References: <1480659025-18836-1-git-send-email-moritz.fischer@ettus.com> Cc: linux-kernel@vger.kernel.org, robh+dt@kernel.org, pantelis.antoniou@konsulko.com, Moritz Fischer From: Frank Rowand Message-ID: <58411EA3.8040000@gmail.com> Date: Thu, 1 Dec 2016 23:11:31 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1480659025-18836-1-git-send-email-moritz.fischer@ettus.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2466 Lines: 95 On 12/01/16 22:10, Moritz Fischer wrote: > From: Moritz Fischer > > No longer fall through into the error case that prints out > an error if no error (err = 0) occurred. > > Fixes d9181b20a83(of: Add back an error message, restructured) > Signed-off-by: Moritz Fischer > Reviewed-by: Frank Rowand > --- > Hi Frank, Rob > > sorry for the noise before. I'm sure I created much more noise than you did. Thanks for persisting. I am confirming that this still applies for v4: Reviewed-by: Frank Rowand -Frank > > Thanks, > Moritz > --- > drivers/of/resolver.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c > index 783bd09..8bf12e9 100644 > --- a/drivers/of/resolver.c > +++ b/drivers/of/resolver.c > @@ -298,12 +298,12 @@ int of_resolve_phandles(struct device_node *overlay) > if (!overlay) { > pr_err("null overlay\n"); > err = -EINVAL; > - goto err_out; > + goto out; > } > if (!of_node_check_flag(overlay, OF_DETACHED)) { > pr_err("overlay not detached\n"); > err = -EINVAL; > - goto err_out; > + goto out; > } > > phandle_delta = live_tree_max_phandle() + 1; > @@ -315,7 +315,7 @@ int of_resolve_phandles(struct device_node *overlay) > > err = adjust_local_phandle_references(local_fixups, overlay, phandle_delta); > if (err) > - goto err_out; > + goto out; > > overlay_fixups = NULL; > > @@ -333,7 +333,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 err_out; > + goto out; > } > > for_each_property_of_node(overlay_fixups, prop) { > @@ -345,12 +345,12 @@ int of_resolve_phandles(struct device_node *overlay) > err = of_property_read_string(tree_symbols, > prop->name, &refpath); > if (err) > - goto err_out; > + goto out; > > refnode = of_find_node_by_path(refpath); > if (!refnode) { > err = -ENOENT; > - goto err_out; > + goto out; > } > > phandle = refnode->phandle; > @@ -361,9 +361,9 @@ int of_resolve_phandles(struct device_node *overlay) > break; > } > > -err_out: > - pr_err("overlay phandle fixup failed: %d\n", err); > out: > + if (err) > + pr_err("overlay phandle fixup failed: %d\n", err); > of_node_put(tree_symbols); > > return err; >