OSDN Git Service

PCI: faraday: Drop pci_fixup_irqs()
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Wed, 28 Jun 2017 20:14:08 +0000 (15:14 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Sun, 2 Jul 2017 21:51:19 +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 ftpci100 host bridge driver.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
drivers/pci/host/pci-ftpci100.c

index 2ee2ffb..e938eeb 100644 (file)
@@ -456,6 +456,8 @@ static int faraday_pci_probe(struct platform_device *pdev)
        host->ops = &faraday_pci_ops;
        host->busnr = 0;
        host->msi = NULL;
+       host->map_irq = of_irq_parse_and_map_pci;
+       host->swizzle_irq = pci_common_swizzle;
        p = pci_host_bridge_priv(host);
        host->sysdata = p;
        p->dev = dev;
@@ -534,7 +536,6 @@ static int faraday_pci_probe(struct platform_device *pdev)
        }
        p->bus = host->bus;
 
-       pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
        pci_bus_assign_resources(p->bus);
        pci_bus_add_devices(p->bus);
        pci_free_resource_list(&res);