mtd: rawnand: Do not treat !maxchips specially in nand_scan_with_ids() (800342de) · Commits · 戴 / test

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:

Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by:

Boris Brezillon <boris.brezillon@bootlin.com> Signed-off-by:

Miquel Raynal <miquel.raynal@bootlin.com>

drivers/mtd/nand/raw/nand_base.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -6722,9 +6722,7 @@ static void nand_detach(struct nand_chip *chip)
		/**
		* nand_scan_with_ids - [NAND Interface] Scan for the NAND device
		* @chip: NAND chip object
		* @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).
		* @maxchips: number of chips to scan for.
		* @ids: optional flash IDs table
		*
		* 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,
		{
		int ret;

		if (maxchips) {
		if (!maxchips)
		return -EINVAL;

		ret = nand_scan_ident(chip, maxchips, ids);
		if (ret)
		return ret;
		}

		ret = nand_attach(chip);
		if (ret)

Admin message