diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-09-15 17:39:11 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-10-24 12:42:51 +0200 |
| commit | 530210c7814e83564c7ca7bca8192515042c0b63 (patch) | |
| tree | 09549bc731f9397cc6a533e091a47d116d5653b5 /arch/mips/pci/pci-rt3883.c | |
| parent | of/irq: Rename of_irq_map_* functions to of_irq_parse_* (diff) | |
| download | linux-530210c7814e83564c7ca7bca8192515042c0b63.tar.xz linux-530210c7814e83564c7ca7bca8192515042c0b63.zip | |
of/irq: Replace of_irq with of_phandle_args
struct of_irq and struct of_phandle_args are exactly the same structure.
This patch makes the kernel use of_phandle_args everywhere. This in
itself isn't a big deal, but it makes some follow-on patches simpler.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/mips/pci/pci-rt3883.c')
| -rw-r--r-- | arch/mips/pci/pci-rt3883.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c index cae92a05ee70..0f08a5ba0b2a 100644 --- a/arch/mips/pci/pci-rt3883.c +++ b/arch/mips/pci/pci-rt3883.c @@ -583,7 +583,7 @@ err_put_intc_node: int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - struct of_irq dev_irq; + struct of_phandle_args dev_irq; int err; int irq; @@ -594,9 +594,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return 0; } - irq = irq_create_of_mapping(dev_irq.controller, - dev_irq.specifier, - dev_irq.size); + irq = irq_create_of_mapping(dev_irq.np, dev_irq.args, dev_irq.args_count); if (irq == 0) pr_crit("pci %s: no irq found for pin %u\n", |