mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-21 16:29:59 +00:00
Code Issues Releases Wiki Activity

mtd: nand-gpio: Use default dev_ready function if RDY is missing in configuration

Browse source 
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>
This commit is contained in:
Alexander Shiyan 2013-05-06 17:53:49 +04:00 committed by David Woodhouse
parent 283df420fc
commit c85d32d568
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/mtd/nand/gpio.c
View file

@ -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;