Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38de2790 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Adam Belay <abelay@mit.edu>
Reviewed-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a550e566

drivers/pnp/pnpbios/core.c

+7 −13
Original line number Original line Diff line number Diff line
@@ -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



	{

		struct task_struct *task;

	init_completion(&unload_sem);

	init_completion(&unload_sem);

	task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");

	task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");

	if (IS_ERR(task))

	if (IS_ERR(task))

		return PTR_ERR(task);

		return PTR_ERR(task);

	}



#endif

	return 0;

	return 0;

}

}