UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: nand: kill the ecc->layout field 

Now that all NAND drivers have switched to mtd_ooblayout_ops, we can kill
the ecc->layout field.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Boris Brezillon 2016-02-03 19:24:10 +01:00
parent e1d132b4ae
commit 7f2b092c9e
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/nand_base.c
View File

@ -4151,13 +4151,6 @@ int nand_scan_tail(struct mtd_info *mtd)
/* Set the internal oob buffer location, just after the page data */ /* Set the internal oob buffer location, just after the page data */
chip->oob_poi = chip->buffers->databuf + mtd->writesize; chip->oob_poi = chip->buffers->databuf + mtd->writesize;
/*
* Set the provided ECC layout. If ecc->layout is NULL, the MTD core
* will just leave mtd->ooblayout to NULL, if it's not NULL, it will
* set ->ooblayout to the default ecclayout wrapper.
*/
mtd_set_ecclayout(mtd, ecc->layout);
/* /*
* If no default placement scheme is given, select an appropriate one. * If no default placement scheme is given, select an appropriate one.
*/ */

8
drivers/mtd/nand/nand_bch.c
View File

@ -158,14 +158,6 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
eccsteps = mtd->writesize/eccsize; eccsteps = mtd->writesize/eccsize;
/*
* Rely on the default ecclayout to ooblayout wrapper provided by MTD
* core if ecc.layout is not NULL.
* FIXME: this should be removed when all callers have moved to the
* mtd_ooblayout_ops approach.
*/
mtd_set_ecclayout(mtd, nand->ecc.layout);
/* Check that we have an oob layout description. */ /* Check that we have an oob layout description. */
if (!mtd->ooblayout) { if (!mtd->ooblayout) {
pr_warn("missing oob scheme"); pr_warn("missing oob scheme");

2
include/linux/mtd/nand.h
View File

@ -473,7 +473,6 @@ struct nand_hw_control {
* @prepad: padding information for syndrome based ECC generators * @prepad: padding information for syndrome based ECC generators
* @postpad: padding information for syndrome based ECC generators * @postpad: padding information for syndrome based ECC generators
* @options: ECC specific options (see NAND_ECC_XXX flags defined above) * @options: ECC specific options (see NAND_ECC_XXX flags defined above)
* @layout: ECC layout control struct pointer
* @priv: pointer to private ECC control data * @priv: pointer to private ECC control data
* @hwctl: function to control hardware ECC generator. Must only * @hwctl: function to control hardware ECC generator. Must only
* be provided if an hardware ECC is available * be provided if an hardware ECC is available
@ -524,7 +523,6 @@ struct nand_ecc_ctrl {
int prepad; int prepad;
int postpad; int postpad;
unsigned int options; unsigned int options;
struct nand_ecclayout *layout;
void *priv; void *priv;
void (*hwctl)(struct mtd_info *mtd, int mode); void (*hwctl)(struct mtd_info *mtd, int mode);
int (*calculate)(struct mtd_info *mtd, const uint8_t *dat, int (*calculate)(struct mtd_info *mtd, const uint8_t *dat,