On Tue, 7 Mar 2017 20:23:59 +0900 Masahiro Yamada <[email protected]> wrote:
> If the higher level accessor chip->write_page() is implemented, > ecc->write_page() and ecc->write_page_raw() are not required. I'm about to remove the chip->write_page() hook [1], I hope you're not planning to use it. [1]https://patchwork.ozlabs.org/patch/729966/ > > Signed-off-by: Masahiro Yamada <[email protected]> > --- > > drivers/mtd/nand/nand_base.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index a3c0f47..c32e700 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -4585,11 +4585,12 @@ static bool invalid_ecc_page_accessors(struct > nand_chip *chip) > * default helpers are not suitable when the core does not > * send the READ0/PAGEPROG commands. > */ > - return (!ecc->read_page || !ecc->write_page || > - !ecc->read_page_raw || !ecc->write_page_raw || > + return !ecc->read_page || !ecc->read_page_raw || > (NAND_HAS_SUBPAGE_READ(chip) && !ecc->read_subpage) || > - (NAND_HAS_SUBPAGE_WRITE(chip) && !ecc->write_subpage && > - ecc->hwctl && ecc->calculate)); > + (!chip->write_page && > + (!ecc->write_page || !ecc->write_page_raw || > + (NAND_HAS_SUBPAGE_WRITE(chip) && !ecc->write_subpage && > + ecc->hwctl && ecc->calculate))); > } > > /** > @@ -4699,8 +4700,9 @@ int nand_scan_tail(struct mtd_info *mtd) > if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) && > (!ecc->read_page || > ecc->read_page == nand_read_page_hwecc || > - !ecc->write_page || > - ecc->write_page == nand_write_page_hwecc)) { > + (!chip->write_page && > + (!ecc->write_page || > + ecc->write_page == nand_write_page_hwecc)))) { > WARN(1, "No ECC functions supplied; hardware ECC not > possible\n"); > ret = -EINVAL; > goto err_free;
