summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2017-06-28 15:14:06 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-07-02 16:51:18 -0500
commit29db991902ece287e7baa3c52de3912659b79a47 (patch)
treef2e0347b59201e6dc2a1cdef81dda4c198a92b2b /drivers
parentcc2eaaef63df7ba34fb3906a395beec02fba9279 (diff)
downloadlinux-stable-29db991902ece287e7baa3c52de3912659b79a47.tar.gz
linux-stable-29db991902ece287e7baa3c52de3912659b79a47.tar.bz2
linux-stable-29db991902ece287e7baa3c52de3912659b79a47.zip
PCI: rcar: 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 rcar host bridge driver. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/host/pcie-rcar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 8380274d61c1..246d485b24c6 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -465,6 +465,8 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
bridge->sysdata = pcie;
bridge->busnr = pcie->root_bus_nr;
bridge->ops = &rcar_pcie_ops;
+ bridge->map_irq = of_irq_parse_and_map_pci;
+ bridge->swizzle_irq = pci_common_swizzle;
if (IS_ENABLED(CONFIG_PCI_MSI))
bridge->msi = &pcie->msi.chip;
@@ -476,8 +478,6 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
bus = bridge->bus;
- pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
-
pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus);