| Message ID | 20240416173711.613750-3-yury.norov@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bfe4ab93c80cc5689ab5a891e61013dfec48f56e |
| Headers | show |
| Series | MIPS: SGI-IP27: micro-optimize arch_init_irq() | expand |
On Tue, Apr 16, 2024 at 10:37:11AM -0700, Yury Norov wrote: > WARN_ON() propagates the result of conditional expression, and it can be > used to return early in the following expression in the arch_init_irq(). > > This is a no-op cleanup, except that compiler may optimize the error paths > better because WARN_ON() implies 'unlikely()'. > > Signed-off-by: Yury Norov <yury.norov@gmail.com> > --- > arch/mips/sgi-ip27/ip27-irq.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c > index d8acdf0439d2..00e63e9ef61d 100644 > --- a/arch/mips/sgi-ip27/ip27-irq.c > +++ b/arch/mips/sgi-ip27/ip27-irq.c > @@ -289,13 +289,12 @@ void __init arch_init_irq(void) > bitmap_set(hub_irq_map, NI_BRDCAST_ERR_A, MSC_PANIC_INTR - NI_BRDCAST_ERR_A + 1); > > fn = irq_domain_alloc_named_fwnode("HUB"); > - WARN_ON(fn == NULL); > - if (!fn) > + if (WARN_ON(fn == NULL)) > return; > + > domain = irq_domain_create_linear(fn, IP27_HUB_IRQ_COUNT, > &hub_domain_ops, NULL); > - WARN_ON(domain == NULL); > - if (!domain) > + if (WARN_ON(domain == NULL)) > return; > > irq_set_default_host(domain); > -- > 2.40.1 applied to mips-next. Thomas.
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index d8acdf0439d2..00e63e9ef61d 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c @@ -289,13 +289,12 @@ void __init arch_init_irq(void) bitmap_set(hub_irq_map, NI_BRDCAST_ERR_A, MSC_PANIC_INTR - NI_BRDCAST_ERR_A + 1); fn = irq_domain_alloc_named_fwnode("HUB"); - WARN_ON(fn == NULL); - if (!fn) + if (WARN_ON(fn == NULL)) return; + domain = irq_domain_create_linear(fn, IP27_HUB_IRQ_COUNT, &hub_domain_ops, NULL); - WARN_ON(domain == NULL); - if (!domain) + if (WARN_ON(domain == NULL)) return; irq_set_default_host(domain);
WARN_ON() propagates the result of conditional expression, and it can be used to return early in the following expression in the arch_init_irq(). This is a no-op cleanup, except that compiler may optimize the error paths better because WARN_ON() implies 'unlikely()'. Signed-off-by: Yury Norov <yury.norov@gmail.com> --- arch/mips/sgi-ip27/ip27-irq.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)