diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2007-05-07 22:58:33 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:40:31 -0400 |
commit | f728b5c3a599d0410a079f447f921a10be7d59d6 (patch) | |
tree | 4bdc0f7bc36012ae50e650762a1ea4f2f2078c66 | |
parent | d1953c8888ef034b912ee33bc2ea2cce6a414402 (diff) |
[POWERPC] Rip out the existing powerpc msi stubs
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>
-rw-r--r-- | arch/powerpc/kernel/irq.c | 27 | ||||
-rw-r--r-- | include/asm-powerpc/machdep.h | 5 |
2 files changed, 0 insertions, 32 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 5719a530f2d1..9ed4931af164 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -958,33 +958,6 @@ arch_initcall(irq_late_init); | |||
958 | 958 | ||
959 | #endif /* CONFIG_PPC_MERGE */ | 959 | #endif /* CONFIG_PPC_MERGE */ |
960 | 960 | ||
961 | #ifdef CONFIG_PCI_MSI | ||
962 | int pci_enable_msi(struct pci_dev * pdev) | ||
963 | { | ||
964 | if (ppc_md.enable_msi) | ||
965 | return ppc_md.enable_msi(pdev); | ||
966 | else | ||
967 | return -1; | ||
968 | } | ||
969 | EXPORT_SYMBOL(pci_enable_msi); | ||
970 | |||
971 | void pci_disable_msi(struct pci_dev * pdev) | ||
972 | { | ||
973 | if (ppc_md.disable_msi) | ||
974 | ppc_md.disable_msi(pdev); | ||
975 | } | ||
976 | EXPORT_SYMBOL(pci_disable_msi); | ||
977 | |||
978 | void pci_scan_msi_device(struct pci_dev *dev) {} | ||
979 | int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) {return -1;} | ||
980 | void pci_disable_msix(struct pci_dev *dev) {} | ||
981 | void msi_remove_pci_irq_vectors(struct pci_dev *dev) {} | ||
982 | void pci_no_msi(void) {} | ||
983 | EXPORT_SYMBOL(pci_enable_msix); | ||
984 | EXPORT_SYMBOL(pci_disable_msix); | ||
985 | |||
986 | #endif | ||
987 | |||
988 | #ifdef CONFIG_PPC64 | 961 | #ifdef CONFIG_PPC64 |
989 | static int __init setup_noirqdistrib(char *str) | 962 | static int __init setup_noirqdistrib(char *str) |
990 | { | 963 | { |
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h index 6fdabd6dfb3e..daa08b1c2121 100644 --- a/include/asm-powerpc/machdep.h +++ b/include/asm-powerpc/machdep.h | |||
@@ -245,11 +245,6 @@ struct machdep_calls { | |||
245 | */ | 245 | */ |
246 | void (*machine_kexec)(struct kimage *image); | 246 | void (*machine_kexec)(struct kimage *image); |
247 | #endif /* CONFIG_KEXEC */ | 247 | #endif /* CONFIG_KEXEC */ |
248 | |||
249 | #ifdef CONFIG_PCI_MSI | ||
250 | int (*enable_msi)(struct pci_dev *pdev); | ||
251 | void (*disable_msi)(struct pci_dev *pdev); | ||
252 | #endif /* CONFIG_PCI_MSI */ | ||
253 | }; | 248 | }; |
254 | 249 | ||
255 | extern void power4_idle(void); | 250 | extern void power4_idle(void); |