aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpbios/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/pnpbios/core.c')
-rw-r--r--drivers/pnp/pnpbios/core.c20
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;
91 * 91 *
92 */ 92 */
93 93
94#ifdef CONFIG_HOTPLUG
95
96static struct completion unload_sem; 94static struct completion unload_sem;
97 95
98/* 96/*
@@ -199,8 +197,6 @@ static int pnp_dock_thread(void *unused)
199 complete_and_exit(&unload_sem, 0); 197 complete_and_exit(&unload_sem, 0);
200} 198}
201 199
202#endif /* CONFIG_HOTPLUG */
203
204static int pnpbios_get_resources(struct pnp_dev *dev) 200static int pnpbios_get_resources(struct pnp_dev *dev)
205{ 201{
206 u8 nodenum = dev->number; 202 u8 nodenum = dev->number;
@@ -573,21 +569,19 @@ fs_initcall(pnpbios_init);
573 569
574static int __init pnpbios_thread_init(void) 570static int __init pnpbios_thread_init(void)
575{ 571{
572 struct task_struct *task;
576#if defined(CONFIG_PPC) 573#if defined(CONFIG_PPC)
577 if (check_legacy_ioport(PNPBIOS_BASE)) 574 if (check_legacy_ioport(PNPBIOS_BASE))
578 return 0; 575 return 0;
579#endif 576#endif
580 if (pnpbios_disabled) 577 if (pnpbios_disabled)
581 return 0; 578 return 0;
582#ifdef CONFIG_HOTPLUG 579
583 { 580 init_completion(&unload_sem);
584 struct task_struct *task; 581 task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
585 init_completion(&unload_sem); 582 if (IS_ERR(task))
586 task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd"); 583 return PTR_ERR(task);
587 if (IS_ERR(task)) 584
588 return PTR_ERR(task);
589 }
590#endif
591 return 0; 585 return 0;
592} 586}
593 587