iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pnpbios: remove CONFIG_HOTPLUG ifdefs

Browse Source 
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>
This commit is contained in:
Bill Pemberton 2012-11-19 13:19:14 -05:00 committed by Greg Kroah-Hartman
parent a550e566f2
commit 38de2790c7
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pnp/pnpbios/core.c
View File

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