From: Lorenzo Pieralisi Date: Wed, 28 Jun 2017 20:14:06 +0000 (-0500) Subject: PCI: xilinx: Drop pci_fixup_irqs() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc2eaaef63df7ba34fb3906a395beec02fba9279;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git PCI: xilinx: 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 xilinx host bridge driver. Signed-off-by: Lorenzo Pieralisi Signed-off-by: Bjorn Helgaas Cc: Michal Simek --- diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index 761f048480e9..d09b00579bde 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -680,6 +680,8 @@ static int xilinx_pcie_probe(struct platform_device *pdev) bridge->sysdata = port; bridge->busnr = 0; bridge->ops = &xilinx_pcie_ops; + bridge->map_irq = of_irq_parse_and_map_pci; + bridge->swizzle_irq = pci_common_swizzle; #ifdef CONFIG_PCI_MSI xilinx_pcie_msi_chip.dev = dev; @@ -692,9 +694,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev) bus = bridge->bus; pci_assign_unassigned_bus_resources(bus); -#ifndef CONFIG_MICROBLAZE - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); -#endif list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); pci_bus_add_devices(bus);