From patchwork Fri Jun 26 17:02:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [MTD,NAND] : fix omap2.c compile failure and warning Date: Fri, 26 Jun 2009 07:02:53 -0000 From: "Singh, Vimal" X-Patchwork-Id: 29200 Message-Id: <57946.192.168.10.89.1246035773.squirrel@dbdmail.itg.ti.com> To: "vimal singh" Cc: "david-b@pacbell.net" , "tom.leiming@gmail.com" , David Woodhouse , "linux-kernel@vger.kernel.org" , "linux-mtd@lists.infradead.org" Somehow I do not see below errors on compilation: drivers/mtd/nand/omap2.c: In function 'omap_wait': drivers/mtd/nand/omap2.c:543: error: 'jiffies' undeclared (first use in this function) drivers/mtd/nand/omap2.c:543: error: (Each undeclared identifier is reported only once drivers/mtd/nand/omap2.c:543: error: for each function it appears in.) drivers/mtd/nand/omap2.c:557: error: implicit declaration of function 'time_before' But still including 'linux/jiffies.h'. Below is the patch. Signed-off-by: Vimal Singh Signed-off-by: Ming Lei --- drivers/mtd/nand/omap2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) timeo += (HZ * 400) / 1000; @@ -558,6 +560,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) status = __raw_readb(this->IO_ADDR_R); if (!(status & 0x40)) break; + cond_resched(); } return status; } diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 0cd76f8..3b6e6ad 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include #include @@ -541,7 +543,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd); unsigned long timeo = jiffies; - int status, state = this->state; + int status = NAND_STATUS_FAIL, state = this->state; if (state == FL_ERASING)