summaryrefslogtreecommitdiff
path: root/arch/mips/pci/pci-rt3883.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-09-15 15:39:11 (GMT)
committerGrant Likely <grant.likely@linaro.org>2013-10-24 10:42:51 (GMT)
commit530210c7814e83564c7ca7bca8192515042c0b63 (patch)
tree09549bc731f9397cc6a533e091a47d116d5653b5 /arch/mips/pci/pci-rt3883.c
parent0c02c8007ea5554d028f99fd3e29fc201fdeeab3 (diff)
downloadlinux-fsl-qoriq-530210c7814e83564c7ca7bca8192515042c0b63.tar.xz
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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index cae92a0..0f08a5b 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",