Commit 49aa76b1 authored by Miquel Raynal's avatar Miquel Raynal

mtd: rawnand: do not execute nand_scan_ident() if maxchips is zero

Some driver (eg. docg4) will need to handle themselves the
identification phase. As part of the migration to use nand_scan()
everywhere (which will unconditionnaly call nand_scan_ident()), we add
a condition at the start of nand_scan_with_ids() to jump over
nand_scan_ident() if the maxchips parameters is zero, meaning that the
driver does not want the core to handle this phase.
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 577e010c
...@@ -6735,7 +6735,9 @@ static void nand_detach(struct nand_chip *chip) ...@@ -6735,7 +6735,9 @@ static void nand_detach(struct nand_chip *chip)
/** /**
* nand_scan_with_ids - [NAND Interface] Scan for the NAND device * nand_scan_with_ids - [NAND Interface] Scan for the NAND device
* @mtd: MTD device structure * @mtd: MTD device structure
* @maxchips: number of chips to scan for * @maxchips: number of chips to scan for. @nand_scan_ident() will not be run if
* this parameter is zero (useful for specific drivers that must
* handle this part of the process themselves, e.g docg4).
* @ids: optional flash IDs table * @ids: optional flash IDs table
* *
* This fills out all the uninitialized function pointers with the defaults. * This fills out all the uninitialized function pointers with the defaults.
...@@ -6748,9 +6750,11 @@ int nand_scan_with_ids(struct mtd_info *mtd, int maxchips, ...@@ -6748,9 +6750,11 @@ int nand_scan_with_ids(struct mtd_info *mtd, int maxchips,
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
int ret; int ret;
if (maxchips) {
ret = nand_scan_ident(mtd, maxchips, ids); ret = nand_scan_ident(mtd, maxchips, ids);
if (ret) if (ret)
return ret; return ret;
}
ret = nand_attach(chip); ret = nand_attach(chip);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment