pnpbios: remove CONFIG_HOTPLUG ifdefs

Remove conditional code based on CONFIG_HOTPLUG being false.  It's
always on now in preparation of it going away as an option.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Adam Belay <abelay@mit.edu>
Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 13 deletions

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 9d4222648640..5d66e5585f97 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -91,8 +91,6 @@ struct pnp_dev_node_info node_info;
  *
  */
 
-#ifdef CONFIG_HOTPLUG
-
 static struct completion unload_sem;
 
 /*
@@ -199,8 +197,6 @@ static int pnp_dock_thread(void *unused)
         complete_and_exit(&unload_sem, 0);
 }
 
-#endif                          /* CONFIG_HOTPLUG */
-
 static int pnpbios_get_resources(struct pnp_dev *dev)
 {
         u8 nodenum = dev->number;
@@ -573,21 +569,19 @@ fs_initcall(pnpbios_init);
 
 static int __init pnpbios_thread_init(void)
 {
+        struct task_struct *task;
 #if defined(CONFIG_PPC)
         if (check_legacy_ioport(PNPBIOS_BASE))
                 return 0;
 #endif
         if (pnpbios_disabled)
                 return 0;
-#ifdef CONFIG_HOTPLUG
-        {
-                struct task_struct *task;
-                init_completion(&unload_sem);
-                task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
-                if (IS_ERR(task))
-                        return PTR_ERR(task);
-        }
-#endif
+
+        init_completion(&unload_sem);
+        task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
+        if (IS_ERR(task))
+                return PTR_ERR(task);
+
         return 0;
 }