Merge branch 'topic/usb-caiaq' into for-linus

[deliverable/linux.git] / drivers / pci / msi.c

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 11a51f8ed3b3b96ffa72820f195c6a7afa4bfa40..b4a90badd0a6d66c57c83961f8bc956a49aa7d7a 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -776,28 +776,19 @@ void pci_no_msi(void)
        pci_msi_enable = 0;
 }
 
-void pci_msi_init_pci_dev(struct pci_dev *dev)
-{
-       INIT_LIST_HEAD(&dev->msi_list);
-}
-
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
-#include <linux/pci-acpi.h>
-static void __devinit msi_acpi_init(void)
+/**
+ * pci_msi_enabled - is MSI enabled?
+ *
+ * Returns true if MSI has not been disabled by the command-line option
+ * pci=nomsi.
+ **/
+int pci_msi_enabled(void)
 {
-       if (acpi_pci_disabled)
-               return;
-       pci_osc_support_set(OSC_MSI_SUPPORT);
-       pcie_osc_support_set(OSC_MSI_SUPPORT);
+       return pci_msi_enable;
 }
-#else
-static inline void msi_acpi_init(void) { }
-#endif /* CONFIG_ACPI */
+EXPORT_SYMBOL(pci_msi_enabled);
 
-void __devinit msi_init(void)
+void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
-       if (!pci_msi_enable)
-               return;
-       msi_acpi_init();
+       INIT_LIST_HEAD(&dev->msi_list);
 }