@@ -135,10 +135,7 @@ static int gpio_nand_devready(struct mtd_info *mtd)
{
struct gpiomtd *gpiomtd = gpio_nand_getpriv(mtd);
- if (gpio_is_valid(gpiomtd->plat.gpio_rdy))
- return gpio_get_value(gpiomtd->plat.gpio_rdy);
-
- return 1;
+ return gpio_get_value(gpiomtd->plat.gpio_rdy);
}
#ifdef CONFIG_OF
@@ -297,6 +294,7 @@ static int gpio_nand_probe(struct platform_device *pdev)
if (ret)
return ret;
gpio_direction_input(gpiomtd->plat.gpio_rdy);
+ chip->dev_ready = gpio_nand_devready;
}
@@ -305,7 +303,6 @@ static int gpio_nand_probe(struct platform_device *pdev)
chip->options = gpiomtd->plat.options;
chip->chip_delay = gpiomtd->plat.chip_delay;
chip->cmd_ctrl = gpio_nand_cmd_ctrl;
- chip->dev_ready = gpio_nand_devready;
if (chip->options & NAND_BUSWIDTH_16) {
chip->read_buf = gpio_nand_readbuf16;
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> --- drivers/mtd/nand/gpio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)