From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus Date: Mon, 28 Feb 2011 14:49:06 +0300 Message-ID: <4D6B8BB2.2010503@ru.mvista.com> References: <4D6916D0.1080501@ru.mvista.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ey0-f174.google.com ([209.85.215.174]:61747 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100Ab1B1Lu1 (ORCPT ); Mon, 28 Feb 2011 06:50:27 -0500 Received: by eyx24 with SMTP id 24so1258411eyx.19 for ; Mon, 28 Feb 2011 03:50:26 -0800 (PST) In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: Sergei Shtylyov , tony@atomide.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Hello. On 28-02-2011 3:03, Paul Walmsley wrote: >> How about empty inline instead? > Thanks for the review; that is indeed a better approach. Following is the > updated patch. > Tony, do you want to take this one? > - Paul > From: Paul Walmsley > Date: Fri, 25 Feb 2011 17:38:25 -0700 > Subject: [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus > On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into > a no-op. Otherwise, compilation breaks on an OMAP4-only config with > the current omap-for-linus branch: > arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices': > ../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init' > Thanks to Sergei Shtylyov for suggesting the use > of a empty static inline function rather than a macro. Not at all. :-) > Signed-off-by: Paul Walmsley > Cc: Tony Lindgren > Cc: Sergei Shtylyov > --- > arch/arm/plat-omap/include/plat/sdrc.h | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h > index efd87c8..2a34a65 100644 > --- a/arch/arm/plat-omap/include/plat/sdrc.h > +++ b/arch/arm/plat-omap/include/plat/sdrc.h > @@ -124,8 +124,14 @@ struct omap_sdrc_params { > u32 mr; > }; > > +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) > void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, > struct omap_sdrc_params *sdrc_cs1); > +#else > +static inline void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, No need to annotate it as __init. > + struct omap_sdrc_params *sdrc_cs1) {}; > +#endif > + WBR, Sergei