PCI: Remove unused pci_fixup_irqs() function

Now we have removed all callers of pci_fixup_irqs() and migrated everything
to pci_assign_irq(), delete the pci_fixup_irqs() function completely.

Signed-off-by: Matthew Minter <matt@masarand.com>
[lorenzo.pieralisi@arm.com: updated commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 81eda3d93a5dca78b3342a75c312af0ddfb128e3..69e3b56c32a43e79f50bf88ec832c67a9ee282db 100644 (file)
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -67,27 +67,3 @@ void pci_assign_irq(struct pci_dev *dev)
           the real IRQ to use; the device does not use it. */
        pcibios_update_irq(dev, irq);
 }
-
-void pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
-                   int (*map_irq)(const struct pci_dev *, u8, u8))
-{
-       /*
-        * Implement pci_fixup_irqs() through pci_assign_irq().
-        * This code should be remove eventually, it is a wrapper
-        * around pci_assign_irq() interface to keep current
-        * pci_fixup_irqs() behaviour unchanged on architecture
-        * code still relying on its interface.
-        */
-       struct pci_dev *dev = NULL;
-       struct pci_host_bridge *hbrg = NULL;
-
-       for_each_pci_dev(dev) {
-               hbrg = pci_find_host_bridge(dev->bus);
-               hbrg->swizzle_irq = swizzle;
-               hbrg->map_irq = map_irq;
-               pci_assign_irq(dev);
-               hbrg->swizzle_irq = NULL;
-               hbrg->map_irq = NULL;
-       }
-}
-EXPORT_SYMBOL_GPL(pci_fixup_irqs);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4869e66dd659a6bc8fe4ad90df2ed9d3ff98ccac..69034ab8a68eb36da216a93728cd96c648c69c5d 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1160,8 +1160,6 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus);
 void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus);
 void pdev_enable_device(struct pci_dev *);
 int pci_enable_resources(struct pci_dev *, int mask);
-void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
-                   int (*)(const struct pci_dev *, u8, u8));
 void pci_assign_irq(struct pci_dev *dev);
 struct resource *pci_find_resource(struct pci_dev *dev, struct resource *res);
 #define HAVE_PCI_REQ_REGIONS   2