Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: designware: 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 designware host bridge driver.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Joao Pinto <Joao.Pinto@synopsys.com>

authored by

Lorenzo Pieralisi and committed by
Bjorn Helgaas
60eca198 64bcd00a

+2 -5
+2 -5
drivers/pci/dwc/pcie-designware-host.c
··· 410 410 bridge->sysdata = pp; 411 411 bridge->busnr = pp->root_bus_nr; 412 412 bridge->ops = &dw_pcie_ops; 413 + bridge->map_irq = of_irq_parse_and_map_pci; 414 + bridge->swizzle_irq = pci_common_swizzle; 413 415 if (IS_ENABLED(CONFIG_PCI_MSI)) { 414 416 bridge->msi = &dw_pcie_msi_chip; 415 417 dw_pcie_msi_chip.dev = dev; ··· 425 423 426 424 if (pp->ops->scan_bus) 427 425 pp->ops->scan_bus(pp); 428 - 429 - #ifdef CONFIG_ARM 430 - /* support old dtbs that incorrectly describe IRQs */ 431 - pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); 432 - #endif 433 426 434 427 pci_bus_size_bridges(bus); 435 428 pci_bus_assign_resources(bus);