]> err.no Git - linux-2.6/commitdiff
[POWERPC] Rip out the existing powerpc msi stubs
authorMichael Ellerman <michael@ellerman.id.au>
Tue, 8 May 2007 02:58:33 +0000 (12:58 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 8 May 2007 03:40:31 +0000 (13:40 +1000)
Rip out the existing powerpc msi stubs. These were the start of an
implementation based on ppc_md calls, but were never used in mainline.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/irq.c
include/asm-powerpc/machdep.h

index 5719a530f2d17db63b012d2b9f9854fe3b5ff3c3..9ed4931af1641253cce9dfce6c52fd6deb91c230 100644 (file)
@@ -958,33 +958,6 @@ arch_initcall(irq_late_init);
 
 #endif /* CONFIG_PPC_MERGE */
 
-#ifdef CONFIG_PCI_MSI
-int pci_enable_msi(struct pci_dev * pdev)
-{
-       if (ppc_md.enable_msi)
-               return ppc_md.enable_msi(pdev);
-       else
-               return -1;
-}
-EXPORT_SYMBOL(pci_enable_msi);
-
-void pci_disable_msi(struct pci_dev * pdev)
-{
-       if (ppc_md.disable_msi)
-               ppc_md.disable_msi(pdev);
-}
-EXPORT_SYMBOL(pci_disable_msi);
-
-void pci_scan_msi_device(struct pci_dev *dev) {}
-int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) {return -1;}
-void pci_disable_msix(struct pci_dev *dev) {}
-void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}
-void pci_no_msi(void) {}
-EXPORT_SYMBOL(pci_enable_msix);
-EXPORT_SYMBOL(pci_disable_msix);
-
-#endif
-
 #ifdef CONFIG_PPC64
 static int __init setup_noirqdistrib(char *str)
 {
index 6fdabd6dfb3e553d3c8193ce25f5c1f6c1767559..daa08b1c212183559785eb75c94e3c00a4e3d341 100644 (file)
@@ -245,11 +245,6 @@ struct machdep_calls {
         */
        void (*machine_kexec)(struct kimage *image);
 #endif /* CONFIG_KEXEC */
-
-#ifdef CONFIG_PCI_MSI
-       int (*enable_msi)(struct pci_dev *pdev);
-       void (*disable_msi)(struct pci_dev *pdev);
-#endif /* CONFIG_PCI_MSI */
 };
 
 extern void power4_idle(void);