| Message ID | 1478666130-13413-8-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | c1d0df192c3adb0a92a984f7f5ae1124027549dd |
| Headers | show |
On 11/09/2016 05:35 AM, Masahiro Yamada wrote: > 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> > --- > > drivers/mtd/nand/denali.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c > index 548278b..44e075a 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) > static void denali_irq_cleanup(int irqnum, struct denali_nand_info *denali) > { > denali_set_intr_modes(denali, false); > - free_irq(irqnum, denali); > } > > static void denali_irq_enable(struct denali_nand_info *denali, > @@ -1456,8 +1455,8 @@ int denali_init(struct denali_nand_info *denali) > * denali_isr register is done after all the hardware > * initilization is finished > */ > - if (request_irq(denali->irq, denali_isr, IRQF_SHARED, > - DENALI_NAND_NAME, denali)) { > + if (devm_request_irq(denali->dev, denali->irq, denali_isr, IRQF_SHARED, > + DENALI_NAND_NAME, denali)) { > dev_err(denali->dev, "Unable to request IRQ\n"); > return -ENODEV; > } >
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 548278b..44e075a 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) static void denali_irq_cleanup(int irqnum, struct denali_nand_info *denali) { denali_set_intr_modes(denali, false); - free_irq(irqnum, denali); } static void denali_irq_enable(struct denali_nand_info *denali, @@ -1456,8 +1455,8 @@ int denali_init(struct denali_nand_info *denali) * denali_isr register is done after all the hardware * initilization is finished */ - if (request_irq(denali->irq, denali_isr, IRQF_SHARED, - DENALI_NAND_NAME, denali)) { + if (devm_request_irq(denali->dev, denali->irq, denali_isr, IRQF_SHARED, + DENALI_NAND_NAME, denali)) { dev_err(denali->dev, "Unable to request IRQ\n"); return -ENODEV; }
Use the managed variant instead of request_irq() and free_irq(). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/mtd/nand/denali.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)