diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-09-30 01:01:20 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-12-10 22:37:29 +0100 |
| commit | 19b2ce184b9f404d6620adf667a9019e6abcae51 (patch) | |
| tree | 35baebb133becb03c9354b13e4717f6f59094686 /drivers/mtd/nand/ecc-sw-hamming.c | |
| parent | 90ccf0a0192f7fa06e52de80cb528c5217e3e297 (diff) | |
mtd: nand: ecc-hamming: Stop using raw NAND structures
This code is meant to be reused by the SPI-NAND core. Now that the
driver has been cleaned and reorganized, use a generic ECC engine
object to store the driver's data instead of accessing members of the
nand_chip structure. This means adding proper init/cleanup helpers.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200929230124.31491-17-miquel.raynal@bootlin.com
Diffstat (limited to 'drivers/mtd/nand/ecc-sw-hamming.c')
| -rw-r--r-- | drivers/mtd/nand/ecc-sw-hamming.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/mtd/nand/ecc-sw-hamming.c b/drivers/mtd/nand/ecc-sw-hamming.c index 7ee0387ecb29..9cd70b4637c1 100644 --- a/drivers/mtd/nand/ecc-sw-hamming.c +++ b/drivers/mtd/nand/ecc-sw-hamming.c @@ -17,8 +17,6 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/rawnand.h> #include <linux/mtd/nand-ecc-sw-hamming.h> #include <asm/byteorder.h> @@ -361,10 +359,11 @@ EXPORT_SYMBOL(ecc_sw_hamming_calculate); int nand_ecc_sw_hamming_calculate(struct nand_device *nand, const unsigned char *buf, unsigned char *code) { - struct nand_chip *chip = mtd_to_nand(nanddev_to_mtd(nand)); - bool sm_order = chip->ecc.options & NAND_ECC_SOFT_HAMMING_SM_ORDER; + struct nand_ecc_sw_hamming_conf *engine_conf = nand->ecc.ctx.priv; + unsigned int step_size = nand->ecc.ctx.conf.step_size; - return ecc_sw_hamming_calculate(buf, chip->ecc.size, code, sm_order); + return ecc_sw_hamming_calculate(buf, step_size, code, + engine_conf->sm_order); } EXPORT_SYMBOL(nand_ecc_sw_hamming_calculate); @@ -453,11 +452,11 @@ int nand_ecc_sw_hamming_correct(struct nand_device *nand, unsigned char *buf, unsigned char *read_ecc, unsigned char *calc_ecc) { - struct nand_chip *chip = mtd_to_nand(nanddev_to_mtd(nand)); - bool sm_order = chip->ecc.options & NAND_ECC_SOFT_HAMMING_SM_ORDER; + struct nand_ecc_sw_hamming_conf *engine_conf = nand->ecc.ctx.priv; + unsigned int step_size = nand->ecc.ctx.conf.step_size; - return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc, chip->ecc.size, - sm_order); + return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc, step_size, + engine_conf->sm_order); } EXPORT_SYMBOL(nand_ecc_sw_hamming_correct); |