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

Commit f5b8aa78 authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: kill the ecclayout->oobavail field 



ecclayout->oobavail is just redundant with the mtd->oobavail field.
Moreover, it prevents static const definition of ecc layouts since the
NAND framework is calculating this value based on the ecclayout->oobfree
field.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 9ebfdf5b

drivers/mtd/devices/docg3.c

+2 −3
Original line number Diff line number Diff line
@@ -72,13 +72,11 @@ MODULE_PARM_DESC(reliable_mode, "Set the docg3 mode (0=normal MLC, 1=fast, " 
 * @eccbytes: 8 bytes are used (1 for Hamming ECC, 7 for BCH ECC)

 * @eccpos: ecc positions (byte 7 is Hamming ECC, byte 8-14 are BCH ECC)

 * @oobfree: free pageinfo bytes (byte 0 until byte 6, byte 15

 * @oobavail: 8 available bytes remaining after ECC toll

 */

static struct nand_ecclayout docg3_oobinfo = {

	.eccbytes = 8,

	.eccpos = {7, 8, 9, 10, 11, 12, 13, 14},

	.oobfree = {{0, 7}, {15, 1} },

	.oobavail = 8,

};



static inline u8 doc_readb(struct docg3 *docg3, u16 reg)
@@ -1438,7 +1436,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, 
		oobdelta = mtd->oobsize;

		break;

	case MTD_OPS_AUTO_OOB:

		oobdelta = mtd->ecclayout->oobavail;

		oobdelta = mtd->oobavail;

		break;

	default:

		return -EINVAL;
@@ -1860,6 +1858,7 @@ static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd) 
	mtd->_write_oob = doc_write_oob;

	mtd->_block_isbad = doc_block_isbad;

	mtd->ecclayout = &docg3_oobinfo;

	mtd->oobavail = 8;

	mtd->ecc_strength = DOC_ECC_BCH_T;



	return 0;

drivers/mtd/mtdswap.c

+8 −8
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int mtdswap_read_markers(struct mtdswap_dev *d, struct swap_eb *eb) 
	if (mtd_can_have_bb(d->mtd) && mtd_block_isbad(d->mtd, offset))

		return MTDSWAP_SCANNED_BAD;



	ops.ooblen = 2 * d->mtd->ecclayout->oobavail;

	ops.ooblen = 2 * d->mtd->oobavail;

	ops.oobbuf = d->oob_buf;

	ops.ooboffs = 0;

	ops.datbuf = NULL;
@@ -359,7 +359,7 @@ static int mtdswap_read_markers(struct mtdswap_dev *d, struct swap_eb *eb) 


	data = (struct mtdswap_oobdata *)d->oob_buf;

	data2 = (struct mtdswap_oobdata *)

		(d->oob_buf + d->mtd->ecclayout->oobavail);

		(d->oob_buf + d->mtd->oobavail);



	if (le16_to_cpu(data->magic) == MTDSWAP_MAGIC_CLEAN) {

		eb->erase_count = le32_to_cpu(data->count);
@@ -933,7 +933,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d, 


	ops.mode = MTD_OPS_AUTO_OOB;

	ops.len = mtd->writesize;

	ops.ooblen = mtd->ecclayout->oobavail;

	ops.ooblen = mtd->oobavail;

	ops.ooboffs = 0;

	ops.datbuf = d->page_buf;

	ops.oobbuf = d->oob_buf;
@@ -945,7 +945,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d, 
		for (i = 0; i < mtd_pages; i++) {

			patt = mtdswap_test_patt(test + i);

			memset(d->page_buf, patt, mtd->writesize);

			memset(d->oob_buf, patt, mtd->ecclayout->oobavail);

			memset(d->oob_buf, patt, mtd->oobavail);

			ret = mtd_write_oob(mtd, pos, &ops);

			if (ret)

				goto error;
@@ -964,7 +964,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d, 
				if (p1[j] != patt)

					goto error;



			for (j = 0; j < mtd->ecclayout->oobavail; j++)

			for (j = 0; j < mtd->oobavail; j++)

				if (p2[j] != (unsigned char)patt)

					goto error;
@@ -1387,7 +1387,7 @@ static int mtdswap_init(struct mtdswap_dev *d, unsigned int eblocks, 
	if (!d->page_buf)

		goto page_buf_fail;



	d->oob_buf = kmalloc(2 * mtd->ecclayout->oobavail, GFP_KERNEL);

	d->oob_buf = kmalloc(2 * mtd->oobavail, GFP_KERNEL);

	if (!d->oob_buf)

		goto oob_buf_fail;
@@ -1454,10 +1454,10 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
		return;

	}



	if (!mtd->oobsize || oinfo->oobavail < MTDSWAP_OOBSIZE) {

	if (!mtd->oobsize || mtd->oobavail < MTDSWAP_OOBSIZE) {

		printk(KERN_ERR "%s: Not enough free bytes in OOB, "

			"%d available, %zu needed.\n",

			MTDSWAP_PREFIX, oinfo->oobavail, MTDSWAP_OOBSIZE);

			MTDSWAP_PREFIX, mtd->oobavail, MTDSWAP_OOBSIZE);

		return;

	}

drivers/mtd/nand/brcmnand/brcmnand.c

+3 −5
Original line number Diff line number Diff line
@@ -828,7 +828,8 @@ static struct nand_ecclayout *brcmnand_create_layout(int ecc_level, 
				    idx2 >= MTD_MAX_OOBFREE_ENTRIES_LARGE - 1)

				break;

		}

		goto out;



		return layout;

	}



	/*
@@ -879,10 +880,7 @@ static struct nand_ecclayout *brcmnand_create_layout(int ecc_level, 
				idx2 >= MTD_MAX_OOBFREE_ENTRIES_LARGE - 1)

			break;

	}

out:

	/* Sum available OOB */

	for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE; i++)

		layout->oobavail += layout->oobfree[i].length;



	return layout;

}

drivers/mtd/nand/docg4.c

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ struct docg4_priv { 
static struct nand_ecclayout docg4_oobinfo = {

	.eccbytes = 9,

	.eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15},

	.oobavail = 5,

	.oobfree = { {.offset = 2, .length = 5} }

};

drivers/mtd/nand/hisi504_nand.c

+0 −1
Original line number Diff line number Diff line
@@ -632,7 +632,6 @@ static void hisi_nfc_host_init(struct hinfc_host *host) 
}



static struct nand_ecclayout nand_ecc_2K_16bits = {

	.oobavail = 6,

	.oobfree = { {2, 6} },

};