diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-08 23:35:26 -0500 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-19 03:38:59 -0500 |
commit | c1d0df192c3adb0a92a984f7f5ae1124027549dd (patch) | |
tree | 91a1f9719a082d1afadf6066d1198646e66e97c7 /drivers/mtd | |
parent | 376563917c23ec8e1d30475233f1111b307fd18b (diff) |
mtd: nand: denali: use managed devm_irq_request()
Use the managed variant instead of request_irq() and free_irq().
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/denali.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 98b21d230e62..5b34d4a6dfa4 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c | |||
@@ -575,7 +575,6 @@ static void denali_irq_init(struct denali_nand_info *denali) | |||
575 | static void denali_irq_cleanup(int irqnum, struct denali_nand_info *denali) | 575 | static void denali_irq_cleanup(int irqnum, struct denali_nand_info *denali) |
576 | { | 576 | { |
577 | denali_set_intr_modes(denali, false); | 577 | denali_set_intr_modes(denali, false); |
578 | free_irq(irqnum, denali); | ||
579 | } | 578 | } |
580 | 579 | ||
581 | static void denali_irq_enable(struct denali_nand_info *denali, | 580 | static void denali_irq_enable(struct denali_nand_info *denali, |
@@ -1456,8 +1455,8 @@ int denali_init(struct denali_nand_info *denali) | |||
1456 | * denali_isr register is done after all the hardware | 1455 | * denali_isr register is done after all the hardware |
1457 | * initilization is finished | 1456 | * initilization is finished |
1458 | */ | 1457 | */ |
1459 | if (request_irq(denali->irq, denali_isr, IRQF_SHARED, | 1458 | if (devm_request_irq(denali->dev, denali->irq, denali_isr, IRQF_SHARED, |
1460 | DENALI_NAND_NAME, denali)) { | 1459 | DENALI_NAND_NAME, denali)) { |
1461 | dev_err(denali->dev, "Unable to request IRQ\n"); | 1460 | dev_err(denali->dev, "Unable to request IRQ\n"); |
1462 | return -ENODEV; | 1461 | return -ENODEV; |
1463 | } | 1462 | } |