Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32813e28 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Get rid of chip->numchips 



The same information is provided by nanddev_ntargets().

Signed-off-by: default avatarBoris Brezillon <bbrezillon@kernel.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
parent 6c836d51

drivers/mtd/nand/raw/diskonchip.c

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd) 
	struct doc_priv *doc = nand_get_controller_data(this);

	struct mtd_partition parts[5];



	if (this->numchips > doc->chips_per_floor) {

	if (nanddev_ntargets(&this->base) > doc->chips_per_floor) {

		pr_err("Multi-floor INFTL devices not yet supported.\n");

		return -EIO;

	}

drivers/mtd/nand/raw/fsl_elbc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int fsl_elbc_attach_chip(struct nand_chip *chip) 
	priv->fmr |= al << FMR_AL_SHIFT;



	dev_dbg(priv->dev, "fsl_elbc_init: nand->numchips = %d\n",

	        chip->numchips);

	        nanddev_ntargets(&chip->base));

	dev_dbg(priv->dev, "fsl_elbc_init: nand->chipsize = %lld\n",

	        nanddev_target_size(&chip->base));

	dev_dbg(priv->dev, "fsl_elbc_init: nand->pagemask = %8x\n",

drivers/mtd/nand/raw/fsl_ifc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int fsl_ifc_attach_chip(struct nand_chip *chip) 
	struct fsl_ifc_mtd *priv = nand_get_controller_data(chip);



	dev_dbg(priv->dev, "%s: nand->numchips = %d\n", __func__,

							chip->numchips);

		nanddev_ntargets(&chip->base));

	dev_dbg(priv->dev, "%s: nand->chipsize = %lld\n", __func__,

	        nanddev_target_size(&chip->base));

	dev_dbg(priv->dev, "%s: nand->pagemask = %8x\n", __func__,

drivers/mtd/nand/raw/hisi504_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int hisi_nfc_resume(struct device *dev) 
	struct hinfc_host *host = dev_get_drvdata(dev);

	struct nand_chip *chip = &host->chip;



	for (cs = 0; cs < chip->numchips; cs++)

	for (cs = 0; cs < nanddev_ntargets(&chip->base); cs++)

		hisi_nfc_send_cmd_reset(host, cs);

	hinfc_write(host, SET_HINFC504_PWIDTH(HINFC504_W_LATCH,

		    HINFC504_R_LATCH, HINFC504_RW_LATCH), HINFC504_PWIDTH);

drivers/mtd/nand/raw/ingenic/jz4740_nand.c

+0 −1
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ static int jz_nand_detect_bank(struct platform_device *pdev, 
		}



		/* Update size of the MTD. */

		chip->numchips++;

		memorg->ntargets++;

		mtd->size += nanddev_target_size(&chip->base);

	}