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>

diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 69e3b56c32a43e79f50bf88ec832c67a9ee282db..86106c44ce94547422647d4fa78946d147e24fa5 100644 (file)
--- 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 69034ab8a68eb36da216a93728cd96c648c69c5d..a9e8d2f3bd919f80804b7439189a5f411b760363 100644 (file)
--- 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 *);