Merge branch 'pci/host-rockchip' into next

[karo-tx-linux.git] / drivers / pci / host / pcie-iproc.c

diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
index 55a36659dabfeb191d45667500da49066eb8c132..c5748634885636e7daf6b40804a037707d1260f0 100644 (file)
--- a/drivers/pci/host/pcie-iproc.c
+++ b/drivers/pci/host/pcie-iproc.c
@@ -1324,6 +1324,8 @@ 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) {
@@ -1331,9 +1333,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
                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;