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

Commit 6c836d51 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Get rid of chip->chipsize 



The target size can now be returned by nanddev_get_targetsize(). Get
rid of the chip->chipsize field and use this helper instead.

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

drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n) 
	}



	/* Configure FLASH */

	chipsize = b47n->nand_chip.chipsize >> 20;

	chipsize = nanddev_target_size(&b47n->nand_chip.base) >> 20;

	tbits = ffs(chipsize); /* find first bit set */

	if (!tbits || tbits != fls(chipsize)) {

		pr_err("Invalid flash size: 0x%lX\n", chipsize);

drivers/mtd/nand/raw/denali.c

+0 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,6 @@ static int denali_multidev_fixup(struct denali_nand_info *denali) 
	mtd->erasesize <<= 1;

	mtd->writesize <<= 1;

	mtd->oobsize <<= 1;

	chip->chipsize <<= 1;

	chip->page_shift += 1;

	chip->phys_erase_shift += 1;

	chip->bbt_erase_shift += 1;

drivers/mtd/nand/raw/fsl_elbc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int fsl_elbc_attach_chip(struct nand_chip *chip) 
	dev_dbg(priv->dev, "fsl_elbc_init: nand->numchips = %d\n",

	        chip->numchips);

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

	        chip->chipsize);

	        nanddev_target_size(&chip->base));

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

	        chip->pagemask);

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

drivers/mtd/nand/raw/fsl_ifc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static int fsl_ifc_attach_chip(struct nand_chip *chip) 
	dev_dbg(priv->dev, "%s: nand->numchips = %d\n", __func__,

							chip->numchips);

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

							chip->chipsize);

	        nanddev_target_size(&chip->base));

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

							chip->pagemask);

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

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

+1 −1
Original line number Diff line number Diff line
@@ -1753,7 +1753,7 @@ static int mx23_boot_init(struct gpmi_nand_data *this) 
	dev_dbg(dev, "Transcribing bad block marks...\n");



	/* Compute the number of blocks in the entire medium. */

	block_count = chip->chipsize >> chip->phys_erase_shift;

	block_count = nanddev_eraseblocks_per_target(&chip->base);



	/*

	 * Loop over all the blocks in the medium, transcribing block marks as