From mboxrd@z Thu Jan  1 00:00:00 1970
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
Date: Thu, 28 Mar 2013 19:02:08 +0000
Subject: [PATCH 1/2] ARM: irq: Call irqchit_init if no init_irq
 function is specified
In-Reply-To: <51548E89.9060505@gmail.com>
References: <1364463704-13692-1-git-send-email-maxime.ripard@free-electrons.com>
 <1364463704-13692-2-git-send-email-maxime.ripard@free-electrons.com>
 <51545832.1050504@gmail.com> <20130328145155.GB3368@n2100.arm.linux.org.uk>
 <51548E89.9060505@gmail.com>
Message-ID: <20130328190207.GF3368@n2100.arm.linux.org.uk>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Thu, Mar 28, 2013 at 01:40:09PM -0500, Rob Herring wrote:
> On 03/28/2013 09:51 AM, Russell King - ARM Linux wrote:
> > On Thu, Mar 28, 2013 at 09:48:18AM -0500, Rob Herring wrote:
> >> On 03/28/2013 04:41 AM, Maxime Ripard wrote:
> >>> +	if (machine_desc->init_irq)
> >>> +		machine_desc->init_irq();
> >>> +	else
> >>> +		irqchip_init();
> >>
> >> There needs to be an empty version defined for !OF.
> > 
> > Better:
> > 
> > #ifdef CONFIG_OF
> > 	if (!machine_desc->init_irq)
> > 		irqchip_init();
> > 	else
> > #endif
> 
> Or the new style:
> 
> 	if (IS_ENABLED(CONFIG_OF) && !machine_desc->init_irq)
> 		irqchip_init();
> 	else
> 
> That needs the empty version, but handles your case.

It shouldn't need the empty version at all - because the compiler should
optimize the "true" case away entirely.