diff options
author | Andrew Patterson <andrew.patterson@hp.com> | 2008-11-10 17:31:05 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 14:12:31 -0500 |
commit | 07ae95f988a34465bdcb384bfa73c03424fe2312 (patch) | |
tree | 4e1901b7fd2ccfdb85a92953c0010a4d3900a3f8 /include/linux/pci.h | |
parent | eb9188bdb9d65aeead2382ec3dd656a17ec8936d (diff) |
ACPI/PCI: PCI MSI _OSC support capabilities called when root bridge added
The _OSC capability OSC_MSI_SUPPORT is set when the root bridge is added
with pci_acpi_osc_support(), so we no longer need to do it in the PCI
MSI driver. Also adds the function pci_msi_enabled, which returns true
if pci=nomsi is not on the kernel command-line.
Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index eae97a2bf603..59a3dc2059d3 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -779,6 +779,10 @@ static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) | |||
779 | 779 | ||
780 | static inline void pci_restore_msi_state(struct pci_dev *dev) | 780 | static inline void pci_restore_msi_state(struct pci_dev *dev) |
781 | { } | 781 | { } |
782 | static inline int pci_msi_enabled(void) | ||
783 | { | ||
784 | return 0; | ||
785 | } | ||
782 | #else | 786 | #else |
783 | extern int pci_enable_msi(struct pci_dev *dev); | 787 | extern int pci_enable_msi(struct pci_dev *dev); |
784 | extern void pci_msi_shutdown(struct pci_dev *dev); | 788 | extern void pci_msi_shutdown(struct pci_dev *dev); |
@@ -789,6 +793,7 @@ extern void pci_msix_shutdown(struct pci_dev *dev); | |||
789 | extern void pci_disable_msix(struct pci_dev *dev); | 793 | extern void pci_disable_msix(struct pci_dev *dev); |
790 | extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); | 794 | extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); |
791 | extern void pci_restore_msi_state(struct pci_dev *dev); | 795 | extern void pci_restore_msi_state(struct pci_dev *dev); |
796 | extern int pci_msi_enabled(void); | ||
792 | #endif | 797 | #endif |
793 | 798 | ||
794 | #ifndef CONFIG_PCIEASPM | 799 | #ifndef CONFIG_PCIEASPM |