| Message ID | 20190919193141.7865-8-miquel.raynal@bootlin.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | Introduce the generic ECC engine abstraction | expand |
On Thu, 19 Sep 2019 21:31:07 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > Now that all files have been migrated to use the new enumeration, drop > the old one which is unused. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > drivers/mtd/nand/raw/nand_base.c | 9 --------- > include/linux/mtd/rawnand.h | 13 ------------- > 2 files changed, 22 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index ad0b892c2523..c313fe4fc16c 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -4833,15 +4833,6 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type) > return ret; > } > > -static const char * const nand_ecc_modes[] = { > - [NAND_ECC_NONE] = "none", > - [NAND_SOFT_ECC_ENGINE] = "soft", > - [NAND_ECC_HW] = "hw", > - [NAND_ECC_HW_SYNDROME] = "hw_syndrome", > - [NAND_ECC_HW_OOB_FIRST] = "hw_oob_first", > - [NAND_ECC_ON_DIE] = "on-die", > -}; You can't really drop that one, for DT backward compat. > - > static const char * const nand_ecc_engine_providers[] = { > [NAND_NO_ECC_ENGINE] = "none", > [NAND_SOFT_ECC_ENGINE] = "soft", > diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h > index 08964ce8b65f..6c9be596a2d1 100644 > --- a/include/linux/mtd/rawnand.h > +++ b/include/linux/mtd/rawnand.h > @@ -80,19 +80,6 @@ struct nand_chip; > > #define NAND_DATA_IFACE_CHECK_ONLY -1 > > -/* > - * Constants for ECC_MODES > - */ > -enum nand_ecc_mode { > - NAND_ECC_INVALID, > - NAND_ECC_NONE, > - NAND_ECC_SOFT, > - NAND_ECC_HW, > - NAND_ECC_HW_SYNDROME, > - NAND_ECC_HW_OOB_FIRST, > - NAND_ECC_ON_DIE, > -}; > - You can drop the enum though, assuming you have a way to convert ecc_modes strings into engine_type+placement pairs. > /** > * enum nand_ecc_engine_type - NAND ECC engine type/provider > * @NAND_INVALID_ECC_ENGINE: Invalid value
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index ad0b892c2523..c313fe4fc16c 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4833,15 +4833,6 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type) return ret; } -static const char * const nand_ecc_modes[] = { - [NAND_ECC_NONE] = "none", - [NAND_SOFT_ECC_ENGINE] = "soft", - [NAND_ECC_HW] = "hw", - [NAND_ECC_HW_SYNDROME] = "hw_syndrome", - [NAND_ECC_HW_OOB_FIRST] = "hw_oob_first", - [NAND_ECC_ON_DIE] = "on-die", -}; - static const char * const nand_ecc_engine_providers[] = { [NAND_NO_ECC_ENGINE] = "none", [NAND_SOFT_ECC_ENGINE] = "soft", diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 08964ce8b65f..6c9be596a2d1 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -80,19 +80,6 @@ struct nand_chip; #define NAND_DATA_IFACE_CHECK_ONLY -1 -/* - * Constants for ECC_MODES - */ -enum nand_ecc_mode { - NAND_ECC_INVALID, - NAND_ECC_NONE, - NAND_ECC_SOFT, - NAND_ECC_HW, - NAND_ECC_HW_SYNDROME, - NAND_ECC_HW_OOB_FIRST, - NAND_ECC_ON_DIE, -}; - /** * enum nand_ecc_engine_type - NAND ECC engine type/provider * @NAND_INVALID_ECC_ENGINE: Invalid value
Now that all files have been migrated to use the new enumeration, drop the old one which is unused. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/nand_base.c | 9 --------- include/linux/mtd/rawnand.h | 13 ------------- 2 files changed, 22 deletions(-)