Skip to content

Commit

Permalink
PCI: iproc: Drop pci_fixup_irqs()
Browse files Browse the repository at this point in the history
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 iproc host bridge driver.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Jon Mason <jonmason@broadcom.com>
  • Loading branch information
Lorenzo Pieralisi authored and Bjorn Helgaas committed Jul 2, 2017
1 parent 29db991 commit 64bcd00
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/pci/host/pcie-iproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1324,16 +1324,15 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
host->dev.parent = dev;
host->ops = &iproc_pcie_ops;
host->sysdata = sysdata;
host->map_irq = pcie->map_irq;
host->swizzle_irq = pci_common_swizzle;

ret = pci_scan_root_bus_bridge(host);
if (ret < 0) {
dev_err(dev, "failed to scan host: %d\n", ret);
goto err_power_off_phy;
}

if (pcie->map_irq)
pci_fixup_irqs(pci_common_swizzle, pcie->map_irq);

pci_assign_unassigned_bus_resources(host->bus);

pcie->root_bus = host->bus;
Expand Down

0 comments on commit 64bcd00

Please sign in to comment.