fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / sh / drivers / pci / fixups-sh03.c

diff --git a/arch/sh/drivers/pci/fixups-sh03.c b/arch/sh/drivers/pci/fixups-sh03.c
index 57ac26c..2e8a18b 100644 (file)
--- a/arch/sh/drivers/pci/fixups-sh03.c
+++ b/arch/sh/drivers/pci/fixups-sh03.c
@@ -3,11 +3,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 
-/*
- *     IRQ functions
- */
-
-int __init pcibios_map_platform_irq(u8 slot, u8 pin, struct pci_dev *dev)
+int __init pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
        int irq;
 
@@ -17,8 +13,9 @@ int __init pcibios_map_platform_irq(u8 slot, u8 pin, struct pci_dev *dev)
                case 8: return 5;       /* eth1       */
                case 6: return 2;       /* PCI bridge */
                default:
-                       printk("PCI: Bad IRQ mapping request for slot %d\n", slot);
-                       return 2;
+                       printk(KERN_ERR "PCI: Bad IRQ mapping request "
+                                       "for slot %d\n", slot);
+                       return 2;
                }
        } else {
                switch (pin) {
@@ -32,30 +29,3 @@ int __init pcibios_map_platform_irq(u8 slot, u8 pin, struct pci_dev *dev)
        }
        return irq;
 }
-
-static u8 __init sh03_no_swizzle(struct pci_dev *dev, u8 *pin)
-{
-       /* no swizzling */
-       return PCI_SLOT(dev->devfn);
-}
-
-static int sh03_pci_lookup_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int irq = -1;
-
-       /* now lookup the actual IRQ on a platform specific basis (pci-'platform'.c) */
-       irq = pcibios_map_platform_irq(slot, pin, dev);
-       if( irq < 0 ) {
-               pr_debug("PCI: Error mapping IRQ on device %s\n", pci_name(dev));
-               return irq;
-       }
-
-       pr_debug("Setting IRQ for slot %s to %d\n", pci_name(dev), irq);
-
-       return irq;
-}
-
-void __init pcibios_fixup_irqs(void)
-{
-       pci_fixup_irqs(sh03_no_swizzle, sh03_pci_lookup_irq);
-}