diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-06-20 10:30:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-05 09:02:40 +0200 |
| commit | c4fa1cb0f6ced5f53979ea24c476fd27e4bce891 (patch) | |
| tree | a71652a4b88f50abe874ed5dc1ff83d50644918e /drivers | |
| parent | 2049dbb6fe55b6bd42e18dc9853c5b9dafc5149d (diff) | |
| download | barebox-c4fa1cb0f6ced5f53979ea24c476fd27e4bce891.tar.gz barebox-c4fa1cb0f6ced5f53979ea24c476fd27e4bce891.tar.xz | |
mtd: nand: simplify nand_block_checkbad
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 670720a284..426ad9bf8b 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); } |