lkml.org 
[lkml]   [2022]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] irqdomain: do not shadow nr_irqs global definition
Date
include/linux/irqnr.h declares a global variable named `nr_irqs'.

The inline function irq_domain_alloc_irqs() from
include/linux/irqdomain.h also uses the same name and thus shadow the
global declaration. Rename the function argument from `nr_irqs' to
`nbr_irqs'.

This patch silences below -Wshadow warning:

| In file included from ./arch/x86/include/asm/irqdomain.h:5,
| from ./arch/x86/include/asm/msi.h:5,
| from ./include/linux/msi.h:23,
| from ./include/linux/kvm_host.h:19,
| from arch/x86/kernel/../kvm/vmx/vmx.h:5,
| from arch/x86/kernel/asm-offsets.c:22:
| ./include/linux/irqdomain.h: In function 'irq_domain_alloc_irqs':
| ./include/linux/irqdomain.h:514:38: warning: declaration of 'nr_irqs' shadows a global declaration [-Wshadow]
| 514 | unsigned int nr_irqs, int node, void *arg)
| | ~~~~~~~~~~~~~^~~~~~~
| In file included from ./include/linux/interrupt.h:10,
| from ./include/linux/kernel_stat.h:9,
| from ./include/linux/cgroup.h:26,
| from ./include/linux/memcontrol.h:13,
| from ./include/linux/swap.h:9,
| from ./include/linux/suspend.h:5,
| from arch/x86/kernel/asm-offsets.c:13:
| ./include/linux/irqnr.h:8:12: note: shadowed declaration is here
| 8 | extern int nr_irqs;
| | ^~~~~~~

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
---
include/linux/irqdomain.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 00d577f90883..76949bb029b0 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -511,9 +511,9 @@ extern int irq_domain_activate_irq(struct irq_data *irq_data, bool early);
extern void irq_domain_deactivate_irq(struct irq_data *irq_data);

static inline int irq_domain_alloc_irqs(struct irq_domain *domain,
- unsigned int nr_irqs, int node, void *arg)
+ unsigned int nbr_irqs, int node, void *arg)
{
- return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false,
+ return __irq_domain_alloc_irqs(domain, -1, nbr_irqs, node, arg, false,
NULL);
}

--
2.35.1
\
 
 \ /
  Last update: 2022-07-29 11:04    [W:0.129 / U:1.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site