[PATCH] mtd: nand: simplify nand_block_checkbad

[PATCH] mtd: nand: simplify nand_block_checkbad

[Uwe Kleine-König]

	if (A) {
		if (!B)
			return C;
		return D;
	}

	return C;

can be simplified to:

	if (A && B)
		return D;

	return C;

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/mtd/nand/nand_base.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 670720a28447..426ad9bf8b30 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -445,10 +445,7 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
 {
 	struct nand_chip *chip = mtd->priv;
 
-	if (IS_ENABLED(CONFIG_NAND_BBT)) {
-		if (!chip->bbt)
-			return chip->block_bad(mtd, ofs, getchip);
-
+	if (IS_ENABLED(CONFIG_NAND_BBT) && chip->bbt) {
 		/* Return info from the table */
 		return nand_isbad_bbt(mtd, ofs, allowbbt);
 	}
-- 
2.8.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] mtd: nand: simplify nand_block_checkbad

[Sascha Hauer]

On Mon, Jun 20, 2016 at 10:30:17AM +0200, Uwe Kleine-König wrote:
> 	if (A) {
> 		if (!B)
> 			return C;
> 		return D;
> 	}
> 
> 	return C;
> 
> can be simplified to:
> 
> 	if (A && B)
> 		return D;
> 
> 	return C;
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/mtd/nand/nand_base.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 

Applied, thanks

Sascha

> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index 670720a28447..426ad9bf8b30 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -445,10 +445,7 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
>  {
>  	struct nand_chip *chip = mtd->priv;
>  
> -	if (IS_ENABLED(CONFIG_NAND_BBT)) {
> -		if (!chip->bbt)
> -			return chip->block_bad(mtd, ofs, getchip);
> -
> +	if (IS_ENABLED(CONFIG_NAND_BBT) && chip->bbt) {
>  		/* Return info from the table */
>  		return nand_isbad_bbt(mtd, ofs, allowbbt);
>  	}
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox