Skip to content

Commit

Permalink
pnpbios: remove CONFIG_HOTPLUG ifdefs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
wfp5p authored and gregkh committed Nov 28, 2012
1 parent a550e56 commit 38de279
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions drivers/pnp/pnpbios/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ struct pnp_dev_node_info node_info;
*
*/

#ifdef CONFIG_HOTPLUG

static struct completion unload_sem;

/*
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 38de279

Please sign in to comment.