From: sshtylyov@mvista.com (Sergei Shtylyov) Date: Tue, 01 May 2012 20:49:37 +0400 Subject: [PATCH v4 06/39] ARM: OMAP2+: onenand: return value in init function In-Reply-To: <91c09cb6a6cb5e87acdcc3f6100a87b4c2a3dd41.1335874494.git.afzal@ti.com> References: <91c09cb6a6cb5e87acdcc3f6100a87b4c2a3dd41.1335874494.git.afzal@ti.com> Message-ID: <4FA01421.9080808@mvista.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hello. On 01-05-2012 16:20, Afzal Mohammed wrote: > Modify board_onenand_init to return platform data. This > would be required for boards to be able to pass it to > gpmc driver so that it finally reaches onenand driver. > Also un-static the function so that boards can use it. > Signed-off-by: Afzal Mohammed [...] > diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h > index 052964c..75ba49f 100644 > --- a/arch/arm/mach-omap2/board-flash.h > +++ b/arch/arm/mach-omap2/board-flash.h > @@ -52,3 +52,15 @@ board_nand_init(struct mtd_partition *nand_parts, > return NULL; > } > #endif > + > +#if defined(CONFIG_MTD_ONENAND_OMAP2) || \ > + defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) You can use IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) instead these two. > +extern struct omap_onenand_platform_data * __init > +board_onenand_init(struct mtd_partition *onenand_parts, u8 nr_parts, u8 cs); > +#else > +static inline struct omap_onenand_platform_data * > +__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) > +{ > + return NULL; > +} > +#endif WBR, Sergei