On Mon, 21 Jan 2019 15:32:07 +0900
Masahiro Yamada <[email protected]> wrote:
> Now that the last user of this hook, denali.c, stopped using it,
> we can remove the erase hook from nand_legacy.
>
> I squashed single_erase() because only the difference between
> single_erase() and nand_erase_op() is the number of bit shifts.
>
> The status/ret conversion in nand_erase_nand() is unneeded since
> commit eb94555e9e97 ("mtd: nand: use usual return values for the
> ->erase() hook"). Cleaned it up now.
Yeah! One less field in nand_legacy :-).
>
> Signed-off-by: Masahiro Yamada <[email protected]>
Reviewed-by: Boris Brezillon <[email protected]>
> ---
>
> This depends on the denali patch:
> http://patchwork.ozlabs.org/patch/1028264/
>
>
> Changes in v2:
> - I noticed the masking by chip->pagemask is still needed
>
> drivers/mtd/nand/raw/nand_base.c | 31 ++++---------------------------
> include/linux/mtd/rawnand.h | 2 --
> 2 files changed, 4 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/nand_base.c
> b/drivers/mtd/nand/raw/nand_base.c
> index cca4b24..7ea3f10 100644
> --- a/drivers/mtd/nand/raw/nand_base.c
> +++ b/drivers/mtd/nand/raw/nand_base.c
> @@ -4155,23 +4155,6 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t
> to,
> }
>
> /**
> - * single_erase - [GENERIC] NAND standard block erase command function
> - * @chip: NAND chip object
> - * @page: the page address of the block which will be erased
> - *
> - * Standard erase command for NAND chips. Returns NAND status.
> - */
> -static int single_erase(struct nand_chip *chip, int page)
> -{
> - unsigned int eraseblock;
> -
> - /* Send commands to erase a block */
> - eraseblock = page >> (chip->phys_erase_shift - chip->page_shift);
> -
> - return nand_erase_op(chip, eraseblock);
> -}
> -
> -/**
> * nand_erase - [MTD Interface] erase block(s)
> * @mtd: MTD device structure
> * @instr: erase instruction
> @@ -4194,7 +4177,7 @@ static int nand_erase(struct mtd_info *mtd, struct
> erase_info *instr)
> int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr,
> int allowbbt)
> {
> - int page, status, pages_per_block, ret, chipnr;
> + int page, pages_per_block, ret, chipnr;
> loff_t len;
>
> pr_debug("%s: start = 0x%012llx, len = %llu\n",
> @@ -4246,17 +4229,11 @@ int nand_erase_nand(struct nand_chip *chip, struct
> erase_info *instr,
> (page + pages_per_block))
> chip->pagebuf = -1;
>
> - if (chip->legacy.erase)
> - status = chip->legacy.erase(chip,
> - page & chip->pagemask);
> - else
> - status = single_erase(chip, page & chip->pagemask);
> -
> - /* See if block erase succeeded */
> - if (status) {
> + ret = nand_erase_op(chip, (page & chip->pagemask) >>
> + (chip->phys_erase_shift -
> chip->page_shift));
> + if (ret) {
> pr_debug("%s: failed erase, page 0x%08x\n",
> __func__, page);
> - ret = -EIO;
> instr->fail_addr =
> ((loff_t)page << chip->page_shift);
> goto erase_exit;
> diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
> index 33e240a..5e37534 100644
> --- a/include/linux/mtd/rawnand.h
> +++ b/include/linux/mtd/rawnand.h
> @@ -936,7 +936,6 @@ static inline void nand_controller_init(struct
> nand_controller *nfc)
> * @waitfunc: hardware specific function for wait on ready.
> * @block_bad: check if a block is bad, using OOB markers
> * @block_markbad: mark a block bad
> - * @erase: erase function
> * @set_features: set the NAND chip features
> * @get_features: get the NAND chip features
> * @chip_delay: chip dependent delay for transferring data from array to read
> @@ -962,7 +961,6 @@ struct nand_legacy {
> int (*waitfunc)(struct nand_chip *chip);
> int (*block_bad)(struct nand_chip *chip, loff_t ofs);
> int (*block_markbad)(struct nand_chip *chip, loff_t ofs);
> - int (*erase)(struct nand_chip *chip, int page);
> int (*set_features)(struct nand_chip *chip, int feature_addr,
> u8 *subfeature_para);
> int (*get_features)(struct nand_chip *chip, int feature_addr,
