PCI: rcar: Drop pci_fixup_irqs()
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Wed, 28 Jun 2017 20:14:06 +0000 (15:14 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Sun, 2 Jul 2017 21:51:18 +0000 (16:51 -0500)
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>
drivers/pci/host/pcie-rcar.c

index 8380274d61c1462b22e7e30a235999c1672fb380..246d485b24c6ce406d27650f91f17dbbbafcf2e4 100644 (file)
@@ -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);