From 03d68558bc49e199b25a1165d092328e0c98fde7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jan 2007 15:41:03 -0800 Subject: [PATCH] --- yaml --- r: 45607 b: refs/heads/master c: b1bf4f412b4818869106ffcb5304d69551697b9c h: refs/heads/master i: 45605: 785ac2b5afe1df07a977d5309e560156c59cefbb 45603: a05ec274471ab8ee94cf86679f9ab76a7fc32a95 45599: 17927372cf781093c33c5f9840af77cd87f47e5e v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/Kconfig | 16 ---------------- trunk/drivers/usb/core/hub.c | 9 +-------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 14997f4cc1b8..4be3ce02db2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53e8f84dc68f29c724bbb7e0675040386f6143ae +refs/heads/master: b1bf4f412b4818869106ffcb5304d69551697b9c diff --git a/trunk/drivers/usb/core/Kconfig b/trunk/drivers/usb/core/Kconfig index f8324d8d06ac..3e66b2a9974a 100644 --- a/trunk/drivers/usb/core/Kconfig +++ b/trunk/drivers/usb/core/Kconfig @@ -72,22 +72,6 @@ config USB_SUSPEND If you are unsure about this, say N here. -config USB_MULTITHREAD_PROBE - bool "USB Multi-threaded probe (EXPERIMENTAL)" - depends on USB && EXPERIMENTAL - default n - help - Say Y here if you want the USB core to spawn a new thread for - every USB device that is probed. This can cause a small speedup - in boot times on systems with a lot of different USB devices. - - This option should be safe to enable, but if any odd probing - problems are found, please disable it, or dynamically turn it - off in the /sys/module/usbcore/parameters/multithread_probe - file - - When in doubt, say N. - config USB_OTG bool depends on USB && EXPERIMENTAL diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index 2651c2e2a89f..1988224b362b 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -88,14 +88,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khubd_wait); static struct task_struct *khubd_task; /* multithreaded probe logic */ -static int multithread_probe = -#ifdef CONFIG_USB_MULTITHREAD_PROBE - 1; -#else - 0; -#endif -module_param(multithread_probe, bool, S_IRUGO); -MODULE_PARM_DESC(multithread_probe, "Run each USB device probe in a new thread"); +static int multithread_probe = 0; /* cycle leds on hubs that aren't blinking for attention */ static int blinkenlights = 0;