diff options
author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2017-06-28 15:14:09 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-02 16:51:19 -0500 |
commit | 6982a068aa5f1681371eaf3385ecb193d0fdc2d4 (patch) | |
tree | fe540c2630c688d4e70bb4fe6384a0d2e926db78 /drivers/pci/host | |
parent | f7c2e69b65fe657e0a32d8db761525cc6109720b (diff) | |
download | linux-next-6982a068aa5f1681371eaf3385ecb193d0fdc2d4.tar.gz |
PCI: generic: Drop pci_fixup_irqs()
Since, through struct pci_host_bridge.map/swizzle_irq hooks, IRQs are now
allocated in the pci_assign_irq() callback automatically, PCI host bridge
drivers can stop relying on pci_fixup_irqs() for IRQ allocation.
Drop pci_fixup_irqs() usage from PCI host-common bridge driver.
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/pci/host')
-rw-r--r-- | drivers/pci/host/pci-host-common.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c index 8e2614ba7a9c..44a47d4f0b8f 100644 --- a/drivers/pci/host/pci-host-common.c +++ b/drivers/pci/host/pci-host-common.c @@ -149,6 +149,8 @@ int pci_host_common_probe(struct platform_device *pdev, bridge->sysdata = cfg; bridge->busnr = cfg->busr.start; bridge->ops = &ops->pci_ops; + bridge->map_irq = of_irq_parse_and_map_pci; + bridge->swizzle_irq = pci_common_swizzle; ret = pci_scan_root_bus_bridge(bridge); if (ret < 0) { @@ -158,10 +160,6 @@ int pci_host_common_probe(struct platform_device *pdev, bus = bridge->bus; -#ifdef CONFIG_ARM - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); -#endif - /* * We insert PCI resources into the iomem_resource and * ioport_resource trees in either pci_bus_claim_resources() |