[PATCH 1/5] mtd: nand: use usual return values for the ->erase() hook

[Boris Brezillon]

On Thu, 30 Nov 2017 18:01:28 +0100
Miquel Raynal <miquel.raynal at free-electrons.com> wrote:

> Avoid using specific defined values for checking returned status of the
> ->erase() hook. Instead, use usual negative error values on failure,  
> zero otherwise.
> 
> Signed-off-by: Miquel Raynal <miquel.raynal at free-electrons.com>
> ---
>  drivers/mtd/nand/denali.c    | 2 +-
>  drivers/mtd/nand/docg4.c     | 7 ++++++-
>  drivers/mtd/nand/nand_base.c | 2 +-
>  3 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
> index 34008a02ddb0..3e19861a46c6 100644
> --- a/drivers/mtd/nand/denali.c
> +++ b/drivers/mtd/nand/denali.c
> @@ -951,7 +951,7 @@ static int denali_erase(struct mtd_info *mtd, int page)
>  	irq_status = denali_wait_for_irq(denali,
>  					 INTR__ERASE_COMP | INTR__ERASE_FAIL);
>  
> -	return irq_status & INTR__ERASE_COMP ? 0 : NAND_STATUS_FAIL;
> +	return irq_status & INTR__ERASE_COMP ? 0 : -EIO;
>  }
>  
>  static int denali_setup_data_interface(struct mtd_info *mtd, int chipnr,
> diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
> index 2436cbc71662..45c01b4b34c7 100644
> --- a/drivers/mtd/nand/docg4.c
> +++ b/drivers/mtd/nand/docg4.c
> @@ -900,6 +900,7 @@ static int docg4_erase_block(struct mtd_info *mtd, int page)
>  	struct docg4_priv *doc = nand_get_controller_data(nand);
>  	void __iomem *docptr = doc->virtadr;
>  	uint16_t g4_page;
> +	int status;
>  
>  	dev_dbg(doc->dev, "%s: page %04x\n", __func__, page);
>  
> @@ -939,7 +940,11 @@ static int docg4_erase_block(struct mtd_info *mtd, int page)
>  	poll_status(doc);
>  	write_nop(docptr);
>  
> -	return nand->waitfunc(mtd, nand);
> +	status = nand->waitfunc(mtd, nand);
> +	if (status < 0)
> +		return status;
> +
> +	return status & NAND_STATUS_FAIL ? -EIO : 0;
>  }
>  
>  static int write_page(struct mtd_info *mtd, struct nand_chip *nand,
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index 630048f5abdc..4d1f2bda6095 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -3077,7 +3077,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
>  		status = chip->erase(mtd, page & chip->pagemask);
>  
>  		/* See if block erase succeeded */
> -		if (status & NAND_STATUS_FAIL) {
> +		if (status) {
>  			pr_debug("%s: failed erase, page 0x%08x\n",
>  					__func__, page);
>  			instr->state = MTD_ERASE_FAILED;

You forgot to patch single_erase() accordingly.