From patchwork Fri Oct 26 05:04:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,06/14] mtd: onenand: omap: use pdata info instead of cpu_is Date: Thu, 25 Oct 2012 19:04:10 -0000 From: Paul Walmsley X-Patchwork-Id: 194353 Message-Id: To: Afzal Mohammed , Tony Lindgren Cc: Artem Bityutskiy , linux-mtd@lists.infradead.org, Jon Hunter , Ivan Djelic , linux-omap@vger.kernel.org, David Woodhouse , linux-arm-kernel@lists.infradead.org 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. - Paul --- 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