Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751208AbaKYPYk (ORCPT ); Tue, 25 Nov 2014 10:24:40 -0500 Received: from benson.vm.bytemark.co.uk ([212.110.190.137]:56746 "EHLO benson.vm.bytemark.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbaKYPYi (ORCPT ); Tue, 25 Nov 2014 10:24:38 -0500 Message-ID: <1416929071.16769.1.camel@debian.org> Subject: Re: [PATCH] of: support passing console options with stdout-path From: Ian Campbell To: Grant Likely Cc: Leif Lindholm , "devicetree@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Linux Kernel Mailing List , Mark Rutland , Rob Herring , Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 25 Nov 2014 15:24:31 +0000 In-Reply-To: References: <1416867838-18652-1-git-send-email-leif.lindholm@linaro.org> <20141125145854.A46EDC44343@trevor.secretlab.ca> <20141125151515.GG2361@bivouac.eciton.net> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.7-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2014-11-25 at 15:20 +0000, Grant Likely wrote: > On Tue, Nov 25, 2014 at 3:15 PM, Leif Lindholm wrote: > > On Tue, Nov 25, 2014 at 02:58:54PM +0000, Grant Likely wrote: > >> > + len = strchrnul(path, ':') - path; > >> > + > >> > for_each_property_of_node(of_aliases, pp) { > >> > if (strlen(pp->name) == len && !strncmp(pp->name, path, len)) { > >> > np = of_find_node_by_path(pp->value); > >> > >> Can you add a testcase to drivers/of/unittests.c for this new path > >> parsing? Then we know it's correct! > > > > Will do. > > > >> > @@ -1830,8 +1835,12 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) > >> > name = of_get_property(of_chosen, "linux,stdout-path", NULL); > >> > if (IS_ENABLED(CONFIG_PPC) && !name) > >> > name = of_get_property(of_aliases, "stdout", NULL); > >> > - if (name) > >> > + if (name) { > >> > of_stdout = of_find_node_by_path(name); > >> > + of_stdout_options = strchr(name, ':'); > >> > + if (of_stdout_options != NULL) > >> > + of_stdout_options++; > >> > + } > >> > >> Not so good. The ':' should actually be a generic part of > >> of_find_node_by_path(), it doesn't have to be limited to stdout parsing. > >> There are other places that would use it. I would add a second, > >> optional, argument to of_find_node_by_path() that will update a pointer > >> to the arguments after the ':'. > > > > So, I agree this would be nicer... > > > > However, I'm counting 157 callers of this function outside of > > drivers/of and 43 inside. Any chance you'd let me get away with a > > separate of_find_extra_options_by_path()? > > I'd rather not. It is a trivial change and can be pretty much done > mechanically. Something like (I think; I always have to look up the > sed syntax): > > sed s/of_find_node_by_path\((.*)\)/of_find_node_by_path\(\1, NULL\) Coccinelle rules for this sort of transformation... Ian. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/