Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / pci / setup-irq.c

diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 81eda3d..86106c4 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,29 +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);
-}
-
-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;
-       }
+       pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
-EXPORT_SYMBOL_GPL(pci_fixup_irqs);