diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-08-10 12:49:57 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-08-10 12:49:57 -0500 |
| commit | 606799cc5049ae4ccb51ba3242365ca2d411da13 (patch) | |
| tree | c4b71297171aebf96a5c4385147dc171fd852f24 | |
| parent | 004cb784018eaa2a078912180bd9999707c3c483 (diff) | |
| download | linux-606799cc5049ae4ccb51ba3242365ca2d411da13.tar.gz linux-606799cc5049ae4ccb51ba3242365ca2d411da13.tar.bz2 linux-606799cc5049ae4ccb51ba3242365ca2d411da13.zip | |
PCI: Inline and remove pcibios_update_irq()
pcibios_update_irq() was a weak function with only one trivial
implementation. Inline it and remove the weak function.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/setup-irq.c | 8 | ||||
| -rw-r--r-- | include/linux/pci.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c index 69e3b56c32a4..86106c44ce94 100644 --- a/drivers/pci/setup-irq.c +++ b/drivers/pci/setup-irq.c @@ -17,12 +17,6 @@ #include <linux/cache.h> #include "pci.h" -void __weak pcibios_update_irq(struct pci_dev *dev, int irq) -{ - dev_dbg(&dev->dev, "assigning IRQ %02d\n", irq); - pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); -} - void pci_assign_irq(struct pci_dev *dev) { u8 pin; @@ -65,5 +59,5 @@ void pci_assign_irq(struct pci_dev *dev) /* Always tell the device, so the driver knows what is the real IRQ to use; the device does not use it. */ - pcibios_update_irq(dev, irq); + pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); } diff --git a/include/linux/pci.h b/include/linux/pci.h index 69034ab8a68e..a9e8d2f3bd91 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -844,7 +844,6 @@ char *pcibios_setup(char *str); resource_size_t pcibios_align_resource(void *, const struct resource *, resource_size_t, resource_size_t); -void pcibios_update_irq(struct pci_dev *, int irq); /* Weak but can be overriden by arch */ void pci_fixup_cardbus(struct pci_bus *); |