mtd: nand: denali: return error code from devm_request_irq() on error
Linux-MTD Mailing List
linux-mtd at lists.infradead.org
Fri Dec 16 11:59:10 PST 2016
Gitweb: http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=7ebb8d06781f87f5c6c6e6bae42ab44ba0fe9012
Commit: 7ebb8d06781f87f5c6c6e6bae42ab44ba0fe9012
Parent: c1d0df192c3adb0a92a984f7f5ae1124027549dd
Author: Masahiro Yamada <yamada.masahiro at socionext.com>
AuthorDate: Wed Nov 9 13:35:27 2016 +0900
Committer: Boris Brezillon <boris.brezillon at free-electrons.com>
CommitDate: Sat Nov 19 09:40:08 2016 +0100
mtd: nand: denali: return error code from devm_request_irq() on error
The devm_request_irq() returns an appropriate error value when it
fails. Use it instead of the fixed -ENODEV.
While we are here, reword the comment to make it fit in a single
line, fixing the misspelling of "initialization".
Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
Reviewed-by: Marek Vasut <marek.vasut at gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
drivers/mtd/nand/denali.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 5b34d4a..f636ac4 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1451,14 +1451,12 @@ int denali_init(struct denali_nand_info *denali)
denali_hw_init(denali);
denali_drv_init(denali);
- /*
- * denali_isr register is done after all the hardware
- * initilization is finished
- */
- if (devm_request_irq(denali->dev, denali->irq, denali_isr, IRQF_SHARED,
- DENALI_NAND_NAME, denali)) {
+ /* Request IRQ after all the hardware initialization is finished */
+ ret = devm_request_irq(denali->dev, denali->irq, denali_isr,
+ IRQF_SHARED, DENALI_NAND_NAME, denali);
+ if (ret) {
dev_err(denali->dev, "Unable to request IRQ\n");
- return -ENODEV;
+ return ret;
}
/* now that our ISR is registered, we can enable interrupts */
More information about the linux-mtd-cvs
mailing list