From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH] of/irq: add empty irq_of_parse_and_map() for non-dt builds Date: Tue, 27 Mar 2012 16:28:27 -0600 Message-ID: <20120327222827.576EE3E1551@localhost> References: <1332581257-15989-1-git-send-email-thomas.abraham@linaro.org> <4F6DC847.8000902@gmail.com> <20120325004232.AD9793E0409@localhost> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Thomas Abraham Cc: Rob Herring , devicetree-discuss@lists.ozlabs.org, patches@linaro.org, Linux Kernel Mailing List List-Id: devicetree@vger.kernel.org On Sun, 25 Mar 2012 20:26:15 +0530, Thomas Abraham wrote: > On 25 March 2012 06:12, Grant Likely wrot= e: > > On Sat, 24 Mar 2012 08:12:39 -0500, Rob Herring wrote: > >> On 03/24/2012 04:27 AM, Thomas Abraham wrote: > >> > Add a empty irq_of_parse_and_map() that returns 0 for non-dt bui= lds and > >> > avoid having #ifdef CONFIG_OF around all calls to irq_of_parse_a= nd_map(). > >> > > >> > Suggested-by: Grant Likely > >> > Signed-off-by: Thomas Abraham > >> > --- > >> > >> Acked-by: Rob Herring > >> > >> Go ahead and merge with the rest of your series. > > > > Actually, it's not quite fully baked; the forward declaration of > > irq_of_parse_and_map() needs to be moved under the #if > > defined(CONFIG_OF_IRQ) block (just move the #if statement up 7 line= s). > > After doing that you can add my acked-by and merge it with the rest= of > > your series. =C2=A0There is no sense merging it through my tree whe= n you > > are the only user depending on it. > > > > Acked-by: Grant Likely >=20 > Thanks. I will do that change which you have suggested and take it > through the Samsung tree. But I was thinking that if it goes through > your tree, there would be less chances of a merge conflict in > include/linux/of_irq.h, a file that might see updates from other > sources. Hmmm... is this going to be merged for v3.4 or v3.5? If it is v3.5, then yes it probably does need to go through my tree since there may be others that need to pull it into their trees. I was thinking that you needed this immediately. g.