| Message ID | 1478666130-13413-10-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | a227d4e4c356c9be84daba80be282ec56ba46c6c |
| Headers | show |
On 11/09/2016 05:35 AM, Masahiro Yamada wrote: > The nand_scan_ident/tail() returns an appropriate error value when > it fails. Use it instead of the fixed -ENXIO. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> > --- > > drivers/mtd/nand/denali.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c > index f188a48..d482d8d 100644 > --- a/drivers/mtd/nand/denali.c > +++ b/drivers/mtd/nand/denali.c > @@ -1474,10 +1474,9 @@ int denali_init(struct denali_nand_info *denali) > * this is the first stage in a two step process to register > * with the nand subsystem > */ > - if (nand_scan_ident(mtd, denali->max_banks, NULL)) { > - ret = -ENXIO; > + ret = nand_scan_ident(mtd, denali->max_banks, NULL); > + if (ret) > goto failed_req_irq; > - } > > /* allocate the right size buffer now */ > devm_kfree(denali->dev, denali->buf.buf); > @@ -1580,10 +1579,9 @@ int denali_init(struct denali_nand_info *denali) > denali->nand.ecc.write_oob = denali_write_oob; > denali->nand.erase = denali_erase; > > - if (nand_scan_tail(mtd)) { > - ret = -ENXIO; > + ret = nand_scan_tail(mtd); > + if (ret) > goto failed_req_irq; > - } > > ret = mtd_device_register(mtd, NULL, 0); > if (ret) { > -- Best regards, Marek Vasut
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index f188a48..d482d8d 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1474,10 +1474,9 @@ int denali_init(struct denali_nand_info *denali) * this is the first stage in a two step process to register * with the nand subsystem */ - if (nand_scan_ident(mtd, denali->max_banks, NULL)) { - ret = -ENXIO; + ret = nand_scan_ident(mtd, denali->max_banks, NULL); + if (ret) goto failed_req_irq; - } /* allocate the right size buffer now */ devm_kfree(denali->dev, denali->buf.buf); @@ -1580,10 +1579,9 @@ int denali_init(struct denali_nand_info *denali) denali->nand.ecc.write_oob = denali_write_oob; denali->nand.erase = denali_erase; - if (nand_scan_tail(mtd)) { - ret = -ENXIO; + ret = nand_scan_tail(mtd); + if (ret) goto failed_req_irq; - } ret = mtd_device_register(mtd, NULL, 0); if (ret) {
The nand_scan_ident/tail() returns an appropriate error value when it fails. Use it instead of the fixed -ENXIO. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/mtd/nand/denali.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 1.9.1