Re: [PATCH 03/15] irq: mips: simplify do_domain_IRQ()

Mark Rutland
2021-10-28T17:12:05Z

On Thu, Oct 28, 2021 at 10:07:32AM -0700, Guenter Roeck wrote:
> On Thu, Oct 21, 2021 at 07:02:24PM +0100, Mark Rutland wrote:
> > There's no need fpr arch/mips's do_domain_IRQ() to open-code the NULL
> > check performed by handle_irq_desc(), nor the resolution of the desc
> > performed by generic_handle_domain_irq().
> >
> > Use generic_handle_domain_irq() directly, as this is functioanlly
> > equivalent and clearer.
> >
> > There should be no functional change as a result of this patch.
> >
>
> Except for this compile error:
>
> arch/mips/kernel/irq.c: In function 'do_domain_IRQ':
> arch/mips/kernel/irq.c:114:26: error: unused variable 'desc' [-Werror=unused-variable]
> 114 | struct irq_desc *desc;
>
> Guenter

Sorry for that; this has been fixed by:

https://lore.kernel.org/r/20211028095652.3503790-1-siyanteng@loongson.cn

... which is queued up:

https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/commit/?h=irq/remove-handle-domain-irq-20211026&id=34fca8947b2743e6a3a9a8a3a44962e625993533

Thanks,
Mark.

>
> > Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> > Cc: Marc Zyngier <maz@kernel.org>
> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > ---
> > arch/mips/kernel/irq.c | 6 +-----
> > 1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
> > index d20e002b3246..1fee96ef8059 100644
> > --- a/arch/mips/kernel/irq.c
> > +++ b/arch/mips/kernel/irq.c
> > @@ -115,11 +115,7 @@ void __irq_entry do_domain_IRQ(struct irq_domain *domain, unsigned int hwirq)
> >
> > irq_enter();
> > check_stack_overflow();
> > -
> > - desc = irq_resolve_mapping(domain, hwirq);
> > - if (likely(desc))
> > - handle_irq_desc(desc);
> > -
> > + generic_handle_domain_irq(domain, hwirq);
> > irq_exit();
> > }
> > #endif
> > --
> > 2.11.0
> >