Commit 800342de authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal

mtd: rawnand: Do not treat !maxchips specially in nand_scan_with_ids()

The only reason we were skipping nand_scan_ident() when maxchips == 0
was to make the docg4 to work. Now that this driver is gone we can
remove this special case and return an error when maxchips is 0.
Suggested-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 871a4073
...@@ -6722,9 +6722,7 @@ static void nand_detach(struct nand_chip *chip) ...@@ -6722,9 +6722,7 @@ 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
* @chip: NAND chip object * @chip: NAND chip object
* @maxchips: number of chips to scan for. @nand_scan_ident() will not be run if * @maxchips: number of chips to scan for.
* 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.
...@@ -6736,11 +6734,12 @@ int nand_scan_with_ids(struct nand_chip *chip, unsigned int maxchips, ...@@ -6736,11 +6734,12 @@ int nand_scan_with_ids(struct nand_chip *chip, unsigned int maxchips,
{ {
int ret; int ret;
if (maxchips) { if (!maxchips)
ret = nand_scan_ident(chip, maxchips, ids); return -EINVAL;
if (ret)
return ret; ret = nand_scan_ident(chip, maxchips, ids);
} if (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