aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
commitcff2f741b8ee8a70b208830e330de053efd4fc45 (patch)
tree83367ed74d889e2c8179f1f8b5d6f6f73b857982 /drivers/pnp
parentb0885d01f9ab1274109c02942c881d598f939623 (diff)
parent92e9e6d1f9844b73a26215025a922e7d7aeae361 (diff)
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
Diffstat (limited to 'drivers/pnp')
-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