diff options
author | Grant Likely <grant.likely@linaro.org> | 2013-09-15 11:55:53 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-05-16 04:19:12 -0400 |
commit | 568f4b903fe1cfc8464c0ce51ad5882c7e227a0e (patch) | |
tree | 24d585587f2b03729e3b452b8a6736932bb36a00 /arch/x86/kernel | |
parent | d6e82b145aec027e127aa36527ae98714dab38ef (diff) |
ENGR00313685-3 of/irq: simplify args to irq_create_of_mapping
commit e6d30ab1e7d1281784672c0fc2ffa385cfb7279e upstream.
All the callers of irq_create_of_mapping() pass the contents of a struct
of_phandle_args structure to the function. Since all the callers already
have an of_phandle_args pointer, why not pass it directly to
irq_create_of_mapping()?
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Conflicts:
arch/arm/mach-integrator/pci_v3.c
arch/mips/pci/pci-rt3883.c
kernel/irq/irqdomain.c
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/devicetree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 125fd1e992ff..0171604becb5 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c | |||
@@ -121,7 +121,7 @@ static int x86_of_pci_irq_enable(struct pci_dev *dev) | |||
121 | if (ret) | 121 | if (ret) |
122 | return ret; | 122 | return ret; |
123 | 123 | ||
124 | virq = irq_create_of_mapping(oirq.np, oirq.args, oirq.args_count); | 124 | virq = irq_create_of_mapping(&oirq); |
125 | if (virq == 0) | 125 | if (virq == 0) |
126 | return -EINVAL; | 126 | return -EINVAL; |
127 | dev->irq = virq; | 127 | dev->irq = virq; |