Commit 004cb784 authored by Matthew Minter's avatar Matthew Minter Committed by Bjorn Helgaas
Browse files

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: default avatarMatthew Minter <matt@masarand.com>
[lorenzo.pieralisi@arm.com: updated commit log]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent b483e3c1

drivers/pci/setup-irq.c

+0 −24
Original line number Diff line number Diff line
@@ -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);

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -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