Commit 216773a7 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds

Consolidate driver_probe_done() loops into one place

there's a few places that currently loop over driver_probe_done(), and
I'm about to add another one. This patch abstracts it into a helper
to reduce duplication.
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Acked-by: default avatarGreg KH <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2f8d7ee
...@@ -18,9 +18,11 @@ ...@@ -18,9 +18,11 @@
*/ */
#include <linux/device.h> #include <linux/device.h>
#include <linux/delay.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/async.h>
#include "base.h" #include "base.h"
#include "power/power.h" #include "power/power.h"
...@@ -167,6 +169,21 @@ int driver_probe_done(void) ...@@ -167,6 +169,21 @@ int driver_probe_done(void)
return 0; return 0;
} }
/**
* wait_for_device_probe
* Wait for device probing to be completed.
*
* Note: this function polls at 100 msec intervals.
*/
int wait_for_device_probe(void)
{
/* wait for the known devices to complete their probing */
while (driver_probe_done() != 0)
msleep(100);
async_synchronize_full();
return 0;
}
/** /**
* driver_probe_device - attempt to bind device & driver together * driver_probe_device - attempt to bind device & driver together
* @drv: driver to bind a device to * @drv: driver to bind a device to
......
...@@ -147,6 +147,8 @@ extern void put_driver(struct device_driver *drv); ...@@ -147,6 +147,8 @@ extern void put_driver(struct device_driver *drv);
extern struct device_driver *driver_find(const char *name, extern struct device_driver *driver_find(const char *name,
struct bus_type *bus); struct bus_type *bus);
extern int driver_probe_done(void); extern int driver_probe_done(void);
extern int wait_for_device_probe(void);
/* sysfs interface for exporting driver attributes */ /* sysfs interface for exporting driver attributes */
......
...@@ -370,10 +370,14 @@ void __init prepare_namespace(void) ...@@ -370,10 +370,14 @@ void __init prepare_namespace(void)
ssleep(root_delay); ssleep(root_delay);
} }
/* wait for the known devices to complete their probing */ /*
while (driver_probe_done() != 0) * wait for the known devices to complete their probing
msleep(100); *
async_synchronize_full(); * Note: this is a potential source of long boot delays.
* For example, it is not atypical to wait 5 seconds here
* for the touchpad of a laptop to initialize.
*/
wait_for_device_probe();
md_run_setup(); md_run_setup();
...@@ -399,6 +403,7 @@ void __init prepare_namespace(void) ...@@ -399,6 +403,7 @@ void __init prepare_namespace(void)
while (driver_probe_done() != 0 || while (driver_probe_done() != 0 ||
(ROOT_DEV = name_to_dev_t(saved_root_name)) == 0) (ROOT_DEV = name_to_dev_t(saved_root_name)) == 0)
msleep(100); msleep(100);
async_synchronize_full();
} }
is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR; is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR;
......
...@@ -281,8 +281,9 @@ static void __init autodetect_raid(void) ...@@ -281,8 +281,9 @@ static void __init autodetect_raid(void)
*/ */
printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n"); printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n"); printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
while (driver_probe_done() < 0)
msleep(100); wait_for_device_probe();
fd = sys_open("/dev/md0", 0, 0); fd = sys_open("/dev/md0", 0, 0);
if (fd >= 0) { if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment