iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: docg3: switch to mtd_ooblayout_ops

Browse Source 
Replace the nand_ecclayout definition by the equivalent mtd_ooblayout_ops
definition.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
This commit is contained in:
Boris Brezillon 2016-02-03 19:05:04 +01:00
parent adbbc3bc82
commit 1bd0b24737
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/mtd/devices/docg3.c
View File

@ -67,16 +67,40 @@ module_param(reliable_mode, uint, 0);
MODULE_PARM_DESC(reliable_mode, "Set the docg3 mode (0=normal MLC, 1=fast, " MODULE_PARM_DESC(reliable_mode, "Set the docg3 mode (0=normal MLC, 1=fast, "
"2=reliable) : MLC normal operations are in normal mode"); "2=reliable) : MLC normal operations are in normal mode");
/** static int docg3_ooblayout_ecc(struct mtd_info *mtd, int section,
* struct docg3_oobinfo - DiskOnChip G3 OOB layout struct mtd_oob_region *oobregion)
* @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) if (section)
* @oobfree: free pageinfo bytes (byte 0 until byte 6, byte 15 return -ERANGE;
*/
static struct nand_ecclayout docg3_oobinfo = { /* byte 7 is Hamming ECC, byte 8-14 are BCH ECC */
.eccbytes = 8, oobregion->offset = 7;
.eccpos = {7, 8, 9, 10, 11, 12, 13, 14}, oobregion->length = 8;
.oobfree = {{0, 7}, {15, 1} },
return 0;
}
static int docg3_ooblayout_free(struct mtd_info *mtd, int section,
struct mtd_oob_region *oobregion)
{
if (section > 1)
return -ERANGE;
/* free bytes: byte 0 until byte 6, byte 15 */
if (!section) {
oobregion->offset = 0;
oobregion->length = 7;
} else {
oobregion->offset = 15;
oobregion->length = 1;
}
return 0;
}
static const struct mtd_ooblayout_ops nand_ooblayout_docg3_ops = {
.ecc = docg3_ooblayout_ecc,
.free = docg3_ooblayout_free,
}; };
static inline u8 doc_readb(struct docg3 *docg3, u16 reg) static inline u8 doc_readb(struct docg3 *docg3, u16 reg)
@ -1857,7 +1881,7 @@ static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
mtd->_read_oob = doc_read_oob; mtd->_read_oob = doc_read_oob;
mtd->_write_oob = doc_write_oob; mtd->_write_oob = doc_write_oob;
mtd->_block_isbad = doc_block_isbad; mtd->_block_isbad = doc_block_isbad;
mtd_set_ecclayout(mtd, &docg3_oobinfo); mtd_set_ooblayout(mtd, &nand_ooblayout_docg3_ops);
mtd->oobavail = 8; mtd->oobavail = 8;
mtd->ecc_strength = DOC_ECC_BCH_T; mtd->ecc_strength = DOC_ECC_BCH_T;