From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH v2 06/14] mtd: onenand: omap: use pdata info instead of cpu_is Date: Fri, 26 Oct 2012 09:41:15 -0700 Message-ID: <20121026164115.GE11908@atomide.com> References: <860ba92c34cbb490beccd5442087087c1751a6a2.1349672877.git.afzal@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:46029 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965386Ab2JZQlU (ORCPT ); Fri, 26 Oct 2012 12:41:20 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: Afzal Mohammed , Artem Bityutskiy , Jon Hunter , David Woodhouse , Ivan Djelic , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org * Paul Walmsley [121025 22:05]: > On Fri, 26 Oct 2012, Paul Walmsley wrote: > > > On Mon, 8 Oct 2012, Afzal Mohammed wrote: > > > > > platform data now contains a field to indicate whether > > > soc belongs to omap34xx family, use it instead of > > > cpu_is_* check. > > > > > > This helps in removing dependency of platform specific > > > header file - cpu.h > > > > > > Signed-off-by: Afzal Mohammed > > > > This one breaks an N800 multi-OMAP build here: > > It also breaks an OMAP3+4 config: > > drivers/built-in.o: In function `omap2_onenand_probe': > /home/paul/test_build/temp/test_cleanup_prcm_8634155e_with_fixes/20121025214236/linux/drivers/mtd/onenand/omap2.c:742: > undefined reference to `omap2_onenand_read_bufferram' > /home/paul/test_build/temp/test_cleanup_prcm_8634155e_with_fixes/20121025214236/linux/drivers/mtd/onenand/omap2.c:743: > undefined reference to `omap2_onenand_write_bufferram' > /home/paul/test_build/temp/test_cleanup_prcm_8634155e_with_fixes/20121025214236/linux/drivers/mtd/onenand/omap2.c:742: > undefined reference to `omap2_onenand_read_bufferram' > /home/paul/test_build/temp/test_cleanup_prcm_8634155e_with_fixes/20121025214236/linux/drivers/mtd/onenand/omap2.c:743: > undefined reference to `omap2_onenand_write_bufferram' > > Fix below. Thanks, I'd like to pull this fix in too along with the others. Regards, Tony > drivers/mtd/onenand/omap2.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c > index f87cf39..99f96e1 100644 > --- a/drivers/mtd/onenand/omap2.c > +++ b/drivers/mtd/onenand/omap2.c > @@ -555,13 +555,19 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, > > #else > > -int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area, > - unsigned char *buffer, int offset, > - size_t count); > +static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area, > + unsigned char *buffer, int offset, > + size_t count) > +{ > + return -ENOSYS; > +} > > -int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, > - const unsigned char *buffer, > - int offset, size_t count); > +static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, > + const unsigned char *buffer, > + int offset, size_t count) > +{ > + return -ENOSYS; > +} > > #endif > > -- > 1.7.10.4