summaryrefslogtreecommitdiffstats
path: root/drivers/pci/host/pci-versatile.c
diff options
context:
space:
mode:
authorLorenzo Pieralisi2017-06-28 22:14:09 +0200
committerBjorn Helgaas2017-07-02 23:51:19 +0200
commitcf60374de8f6e9bfe42bcdf959bd474984a82ea1 (patch)
tree1f814a6c73fe0ed4897cbcbc68e3c4bd4cd81151 /drivers/pci/host/pci-versatile.c
parentPCI: generic: Drop pci_fixup_irqs() (diff)
downloadkernel-qcow2-linux-cf60374de8f6e9bfe42bcdf959bd474984a82ea1.tar.gz
kernel-qcow2-linux-cf60374de8f6e9bfe42bcdf959bd474984a82ea1.tar.xz
kernel-qcow2-linux-cf60374de8f6e9bfe42bcdf959bd474984a82ea1.zip
PCI: versatile: 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 versatile host bridge driver. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> [bhelgaas: folded in typo fix from Arnd Bergmann <arnd@arndb.de>: http://lkml.kernel.org/r/20170621215323.3921382-4-arnd@arndb.de] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/pci/host/pci-versatile.c')
-rw-r--r--drivers/pci/host/pci-versatile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index b3c325f451b6..f6fcec6b5578 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -209,6 +209,8 @@ static int versatile_pci_probe(struct platform_device *pdev)
bridge->sysdata = NULL;
bridge->busnr = 0;
bridge->ops = &pci_versatile_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)
@@ -216,8 +218,6 @@ static int versatile_pci_probe(struct platform_device *pdev)
bus = bridge->bus;
- pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
-
pci_assign_unassigned_bus_resources(bus);
list_for_each_entry(child, &bus->children, node)
pcie_bus_configure_settings(child);