OSDN Git Service

irqchip/nvic: Use irq_domain_translate_onecell instead of custom func
authorYash Shah <yash.shah@sifive.com>
Tue, 10 Dec 2019 11:11:10 +0000 (16:41 +0530)
committerMarc Zyngier <maz@kernel.org>
Mon, 20 Jan 2020 09:24:47 +0000 (09:24 +0000)
Make use of newly introduced irq_domain_translate_onecell() instead of
custom made function.

Signed-off-by: Yash Shah <yash.shah@sifive.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1575976274-13487-3-git-send-email-yash.shah@sifive.com
drivers/irqchip/irq-nvic.c

index a166d30..f747e22 100644 (file)
@@ -45,17 +45,6 @@ nvic_handle_irq(irq_hw_number_t hwirq, struct pt_regs *regs)
        handle_IRQ(irq, regs);
 }
 
-static int nvic_irq_domain_translate(struct irq_domain *d,
-                                    struct irq_fwspec *fwspec,
-                                    unsigned long *hwirq, unsigned int *type)
-{
-       if (WARN_ON(fwspec->param_count < 1))
-               return -EINVAL;
-       *hwirq = fwspec->param[0];
-       *type = IRQ_TYPE_NONE;
-       return 0;
-}
-
 static int nvic_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
                                unsigned int nr_irqs, void *arg)
 {
@@ -64,7 +53,7 @@ static int nvic_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
        unsigned int type = IRQ_TYPE_NONE;
        struct irq_fwspec *fwspec = arg;
 
-       ret = nvic_irq_domain_translate(domain, fwspec, &hwirq, &type);
+       ret = irq_domain_translate_onecell(domain, fwspec, &hwirq, &type);
        if (ret)
                return ret;
 
@@ -75,7 +64,7 @@ static int nvic_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
 }
 
 static const struct irq_domain_ops nvic_irq_domain_ops = {
-       .translate = nvic_irq_domain_translate,
+       .translate = irq_domain_translate_onecell,
        .alloc = nvic_irq_domain_alloc,
        .free = irq_domain_free_irqs_top,
 };