ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520 (ea5d8f42) · Commits · 戴 / test

Commit ("mtd: onenand: omap: use pdata info instead of cpu_is") broke an OMAP3+4 build and an N800 multi-OMAP2xxx build here: drivers/built-in.o: In function `omap2_onenand_probe': drivers/mtd/onenand/omap2.c:742: undefined reference to `omap2_onenand_read_bufferram' drivers/mtd/onenand/omap2.c:743: undefined reference to `omap2_onenand_write_bufferram' drivers/mtd/onenand/omap2.c:742: undefined reference to `omap2_onenand_read_bufferram' drivers/mtd/onenand/omap2.c:743: undefined reference to `omap2_onenand_write_bufferram' ... drivers/built-in.o: In function `omap2_onenand_probe': drivers/mtd/onenand/omap2.c:788: undefined reference to `omap3_onenand_read_bufferram' drivers/mtd/onenand/omap2.c:788: undefined reference to `omap3_onenand_write_bufferram' Fix by declaring static functions for the missing symbols, rather than just prototypes. Signed-off-by:

Paul Walmsley <paul@pwsan.com> Cc: Afzal Mohammed <afzal@ti.com> Cc: Tony Lindgren <tony@atomide.com>

drivers/mtd/onenand/omap2.c

+24 −12

Original line number	Diff line number	Diff line
		@@ -445,13 +445,19 @@ out_copy:

		#else

		int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
		static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
		unsigned char *buffer, int offset,
		size_t count);
		size_t count)
		{
		return -ENOSYS;
		}

		int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
		static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
		const unsigned char *buffer,
		int offset, size_t count);
		int offset, size_t count)
		{
		return -ENOSYS;
		}

		#endif

		@@ -549,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,
		static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area,
		unsigned char *buffer, int offset,
		size_t count);
		size_t count)
		{
		return -ENOSYS;
		}

		int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
		static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
		const unsigned char *buffer,
		int offset, size_t count);
		int offset, size_t count)
		{
		return -ENOSYS;
		}

		#endif

Admin message