aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-09-15 11:39:11 -0400
committerGrant Likely <grant.likely@linaro.org>2013-10-24 06:42:51 -0400
commit530210c7814e83564c7ca7bca8192515042c0b63 (patch)
tree09549bc731f9397cc6a533e091a47d116d5653b5 /drivers/pci
parent0c02c8007ea5554d028f99fd3e29fc201fdeeab3 (diff)
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 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-mvebu.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 05f81807d05b..c5e57f82b9af 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -647,15 +647,14 @@ static int __init mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
647 647
648static int __init mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 648static int __init mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
649{ 649{
650 struct of_irq oirq; 650 struct of_phandle_args oirq;
651 int ret; 651 int ret;
652 652
653 ret = of_irq_parse_pci(dev, &oirq); 653 ret = of_irq_parse_pci(dev, &oirq);
654 if (ret) 654 if (ret)
655 return ret; 655 return ret;
656 656
657 return irq_create_of_mapping(oirq.controller, oirq.specifier, 657 return irq_create_of_mapping(oirq.np, oirq.args, oirq.args_count);
658 oirq.size);
659} 658}
660 659
661static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys) 660static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys)