FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-14 05:12:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: mtd: drop NAND_ECC_SOFT_BCH enum value

Browse Source 
This value should not be part of nand_ecc_modes_t as it specifies
algorithm not a mode. We successfully managed to introduce new "algo"
field which is respected now.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Rafał Miłecki 2016-04-17 22:53:07 +02:00 committed by Boris Brezillon
parent ae211bcfa1
commit e4225ae823
7 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/nand/fsmc_nand.c
View File

@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
break;
case NAND_ECC_SOFT:
case NAND_ECC_SOFT_BCH:
if (nand->ecc.algo == NAND_ECC_BCH) {
dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n");
break;
@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
* Don't set layout for BCH4 SW ECC. This will be
* generated later in nand_bch_init() later.
*/
if (nand->ecc.mode != NAND_ECC_SOFT_BCH) {
if (nand->ecc.mode == NAND_ECC_HW) {
switch (mtd->oobsize) {
case 16:
case 64:

1
drivers/mtd/nand/jz4780_nand.c
View File

@ -179,7 +179,6 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
chip->ecc.correct = jz4780_nand_ecc_correct;
/* fall through */
case NAND_ECC_SOFT:
case NAND_ECC_SOFT_BCH:
dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n",
(nfc->bch) ? "hardware BCH" : "software ECC",
chip->ecc.strength, chip->ecc.size, chip->ecc.bytes);

1
drivers/mtd/nand/mxc_nand.c
View File

@ -1625,7 +1625,6 @@ static int mxcnd_probe(struct platform_device *pdev)
break;
case NAND_ECC_SOFT:
case NAND_ECC_SOFT_BCH:
break;
default:

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

@ -4183,8 +4183,7 @@ static int nand_set_ecc_soft_ops(struct mtd_info *mtd)
struct nand_chip *chip = mtd_to_nand(mtd);
struct nand_ecc_ctrl *ecc = &chip->ecc;
if (WARN_ON(ecc->mode != NAND_ECC_SOFT &&
ecc->mode != NAND_ECC_SOFT_BCH))
if (WARN_ON(ecc->mode != NAND_ECC_SOFT))
return -EINVAL;
switch (ecc->algo) {
@ -4331,8 +4330,7 @@ int nand_scan_tail(struct mtd_info *mtd)
* If no default placement scheme is given, select an appropriate one.
*/
if (!mtd->ooblayout &&
!((ecc->mode == NAND_ECC_SOFT || ecc->mode == NAND_ECC_SOFT_BCH) &&
ecc->algo == NAND_ECC_BCH)) {
!(ecc->mode == NAND_ECC_SOFT && ecc->algo == NAND_ECC_BCH)) {
switch (mtd->oobsize) {
case 8:
case 16:
@ -4426,7 +4424,6 @@ int nand_scan_tail(struct mtd_info *mtd)
ecc->algo = NAND_ECC_HAMMING;
case NAND_ECC_SOFT:
case NAND_ECC_SOFT_BCH:
ret = nand_set_ecc_soft_ops(mtd);
if (ret) {
ret = -EINVAL;
@ -4514,7 +4511,6 @@ int nand_scan_tail(struct mtd_info *mtd)
/* Large page NAND with SOFT_ECC should support subpage reads */
switch (ecc->mode) {
case NAND_ECC_SOFT:
case NAND_ECC_SOFT_BCH:
if (chip->page_shift > 9)
chip->options |= NAND_SUBPAGE_READ;
break;
@ -4614,8 +4610,7 @@ void nand_release(struct mtd_info *mtd)
{
struct nand_chip *chip = mtd_to_nand(mtd);
if ((chip->ecc.mode == NAND_ECC_SOFT ||
chip->ecc.mode == NAND_ECC_SOFT_BCH) &&
if (chip->ecc.mode == NAND_ECC_SOFT &&
chip->ecc.algo == NAND_ECC_BCH)
nand_bch_free((struct nand_bch_control *)chip->ecc.priv);

2
drivers/mtd/nand/nandsim.c
View File

@ -2339,7 +2339,7 @@ static int __init ns_init_module(void)
retval = -EINVAL;
goto error;
}
chip->ecc.mode = NAND_ECC_SOFT_BCH;
chip->ecc.mode = NAND_ECC_SOFT;
chip->ecc.algo = NAND_ECC_BCH;
chip->ecc.size = 512;
chip->ecc.strength = bch;

2
drivers/mtd/nand/sunxi_nand.c
View File

@ -1612,8 +1612,6 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc,
return -EINVAL;
switch (ecc->mode) {
case NAND_ECC_SOFT_BCH:
break;
case NAND_ECC_HW:
ret = sunxi_nand_hw_ecc_ctrl_init(mtd, ecc, np);
if (ret)

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

@ -116,7 +116,6 @@ typedef enum {
NAND_ECC_HW,
NAND_ECC_HW_SYNDROME,
NAND_ECC_HW_OOB_FIRST,
NAND_ECC_SOFT_BCH,
} nand_ecc_modes_t;
enum nand_ecc_algo {