1 files changed, 8 insertions, 22 deletions

diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index c2fd3095701f..ca8127950fcd 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -37,6 +37,7 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci-acpi.h>
 #include <linux/pci_hotplug.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
@@ -48,6 +49,7 @@
 #define SLOT_NAME_SIZE  21              /* {_SUN} */
 
 bool acpiphp_debug;
+bool acpiphp_disabled;
 
 /* local variables */
 static struct acpiphp_attention_info *attention_info;
@@ -60,7 +62,9 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
+MODULE_PARM_DESC(disable, "disable acpiphp driver");
 module_param_named(debug, acpiphp_debug, bool, 0644);
+module_param_named(disable, acpiphp_disabled, bool, 0444);
 
 /* export the attention callback registration methods */
 EXPORT_SYMBOL_GPL(acpiphp_register_attention);
@@ -351,27 +355,9 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
 }
 
 
-static int __init acpiphp_init(void)
+void __init acpiphp_init(void)
 {
-        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
-
-        if (acpi_pci_disabled)
-                return 0;
-
-        /* read all the ACPI info from the system */
-        /* initialize internal data structure etc. */
-        return acpiphp_glue_init();
-}
-
-
-static void __exit acpiphp_exit(void)
-{
-        if (acpi_pci_disabled)
-                return;
-
-        /* deallocate internal data structures etc. */
-        acpiphp_glue_exit();
+        info(DRIVER_DESC " version: " DRIVER_VERSION "%s\n",
+                acpiphp_disabled ? ", disabled by user; please report a bug"
+                                 : "");
 }
-
-module_init(acpiphp_init);
-module_exit(acpiphp_exit);