Message ID | 20201227102812.27699-1-xypron.glpk@gmx.de |
---|---|
State | Accepted |
Commit | 389b45d6b05784c0043bac859666b98a5f704402 |
Delegated to: | Tom Rini |
Headers | show |
Series | [1/1] zynq: mtd: nand: remove superfluous if | expand |
On 27. 12. 20 11:28, Heinrich Schuchardt wrote: > This sort of code does not make much sense: > > if (ondie_ecc_enabled) { > if (ondie_ecc_enabled) { > > Remove the inner if. > > The problem was indicated by cppcheck. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > drivers/mtd/nand/raw/zynq_nand.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c > index 92db2aa19c..65817ea7f2 100644 > --- a/drivers/mtd/nand/raw/zynq_nand.c > +++ b/drivers/mtd/nand/raw/zynq_nand.c > @@ -1206,12 +1206,10 @@ static int zynq_nand_probe(struct udevice *dev) > nand_chip->options |= NAND_SUBPAGE_READ; > > /* On-Die ECC spare bytes offset 8 is used for ECC codes */ > - if (ondie_ecc_enabled) { > - nand_chip->ecc.layout = &ondie_nand_oob_64; > - /* Use the BBT pattern descriptors */ > - nand_chip->bbt_td = &bbt_main_descr; > - nand_chip->bbt_md = &bbt_mirror_descr; > - } > + nand_chip->ecc.layout = &ondie_nand_oob_64; > + /* Use the BBT pattern descriptors */ > + nand_chip->bbt_td = &bbt_main_descr; > + nand_chip->bbt_md = &bbt_mirror_descr; > } else { > /* Hardware ECC generates 3 bytes ECC code for each 512 bytes */ > nand_chip->ecc.mode = NAND_ECC_HW; > -- > 2.29.2 > Applied. M
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index 92db2aa19c..65817ea7f2 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -1206,12 +1206,10 @@ static int zynq_nand_probe(struct udevice *dev) nand_chip->options |= NAND_SUBPAGE_READ; /* On-Die ECC spare bytes offset 8 is used for ECC codes */ - if (ondie_ecc_enabled) { - nand_chip->ecc.layout = &ondie_nand_oob_64; - /* Use the BBT pattern descriptors */ - nand_chip->bbt_td = &bbt_main_descr; - nand_chip->bbt_md = &bbt_mirror_descr; - } + nand_chip->ecc.layout = &ondie_nand_oob_64; + /* Use the BBT pattern descriptors */ + nand_chip->bbt_td = &bbt_main_descr; + nand_chip->bbt_md = &bbt_mirror_descr; } else { /* Hardware ECC generates 3 bytes ECC code for each 512 bytes */ nand_chip->ecc.mode = NAND_ECC_HW;
This sort of code does not make much sense: if (ondie_ecc_enabled) { if (ondie_ecc_enabled) { Remove the inner if. The problem was indicated by cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- drivers/mtd/nand/raw/zynq_nand.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.29.2