diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-05-06 15:53:49 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-05 21:45:05 +0200 |
| commit | c85d32d56859bb01f775e12771150dc47a7b03ba (patch) | |
| tree | 461686c8c04ed027df012dfe166dd2cb0763ef41 /drivers/mtd/nand/gpio.c | |
| parent | mtd: nand-gpio: Convert driver to using resource-managed functions (diff) | |
| download | linux-c85d32d56859bb01f775e12771150dc47a7b03ba.tar.xz linux-c85d32d56859bb01f775e12771150dc47a7b03ba.zip | |
mtd: nand-gpio: Use default dev_ready function if RDY is missing in configuration
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/gpio.c')
| -rw-r--r-- | drivers/mtd/nand/gpio.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c index c35f46e81d1c..8f102d162126 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -136,10 +136,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 @@ -307,6 +304,7 @@ static int gpio_nand_probe(struct platform_device *dev) if (ret) return ret; gpio_direction_input(gpiomtd->plat.gpio_rdy); + this->dev_ready = gpio_nand_devready; } this->IO_ADDR_W = this->IO_ADDR_R; @@ -316,7 +314,6 @@ static int gpio_nand_probe(struct platform_device *dev) /* install our routines */ this->cmd_ctrl = gpio_nand_cmd_ctrl; - this->dev_ready = gpio_nand_devready; if (this->options & NAND_BUSWIDTH_16) { this->read_buf = gpio_nand_readbuf16; |