mtd: rawnand: Stop using chip->state in drivers

[linux-2.6-block.git] / drivers / mtd / nand / raw / r852.c

diff --git a/drivers/mtd/nand/raw/r852.c b/drivers/mtd/nand/raw/r852.c
index c01422d953dd80487f3a21839bccf6859d818951..86456216fb93f5bf9b90fc6b6f454630e947269b 100644 (file)
--- a/drivers/mtd/nand/raw/r852.c
+++ b/drivers/mtd/nand/raw/r852.c
@@ -369,8 +369,7 @@ static int r852_wait(struct nand_chip *chip)
        unsigned long timeout;
        u8 status;
 
-       timeout = jiffies + (chip->state == FL_ERASING ?
-               msecs_to_jiffies(400) : msecs_to_jiffies(20));
+       timeout = jiffies + msecs_to_jiffies(400);
 
        while (time_before(jiffies, timeout))
                if (chip->legacy.dev_ready(chip))