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

Commit 8b311ead authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon
Browse files

mtd: nand: remove unused NAND_OWN_BUFFERS flag 



The last/only user of NAND_OWN_BUFFERS (cafe_nand.c) has been reworked.
This flag is no longer needed.

Suggested-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent f880b07b

drivers/mtd/nand/nand_base.c

+20 −25
Original line number Diff line number Diff line
@@ -5319,7 +5319,6 @@ int nand_scan_tail(struct mtd_info *mtd) 
		return -EINVAL;

	}



	if (!(chip->options & NAND_OWN_BUFFERS)) {

	nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL);

	if (!nbuf)

		return -ENOMEM;
@@ -5336,17 +5335,13 @@ int nand_scan_tail(struct mtd_info *mtd) 
		goto err_free_nbuf;

	}



		nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize,

					GFP_KERNEL);

	nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL);

	if (!nbuf->databuf) {

		ret = -ENOMEM;

		goto err_free_nbuf;

	}



	chip->buffers = nbuf;

	} else if (!chip->buffers) {

		return -ENOMEM;

	}



	/*

	 * FIXME: some NAND manufacturer drivers expect the first die to be
@@ -5701,7 +5696,7 @@ void nand_cleanup(struct nand_chip *chip) 


	/* Free bad block table memory */

	kfree(chip->bbt);

	if (!(chip->options & NAND_OWN_BUFFERS) && chip->buffers) {

	if (chip->buffers) {

		kfree(chip->buffers->databuf);

		kfree(chip->buffers->ecccode);

		kfree(chip->buffers->ecccalc);

include/linux/mtd/rawnand.h

+0 −5
Original line number Diff line number Diff line
@@ -185,11 +185,6 @@ enum nand_ecc_algo { 
/* Non chip related options */

/* This option skips the bbt scan during initialization. */

#define NAND_SKIP_BBTSCAN	0x00010000

/*

 * This option is defined if the board driver allocates its own buffers

 * (e.g. because it needs them DMA-coherent).

 */

#define NAND_OWN_BUFFERS	0x00020000

/* Chip may not exist, so silence any errors in scan */

#define NAND_SCAN_SILENT_NODEV	0x00040000

/*