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: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Acked-by: Greg KH <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 12 insertions, 6 deletions

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 708105e163df..8d4ff5afc1d8 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -370,10 +370,14 @@ void __init prepare_namespace(void)
                 ssleep(root_delay);
         }
 
-        /* wait for the known devices to complete their probing */
-        while (driver_probe_done() != 0)
-                msleep(100);
-        async_synchronize_full();
+        /*
+         * wait for the known devices to complete their probing
+         *
+         * 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();
 
@@ -399,6 +403,7 @@ void __init prepare_namespace(void)
                 while (driver_probe_done() != 0 ||
                         (ROOT_DEV = name_to_dev_t(saved_root_name)) == 0)
                         msleep(100);
+                async_synchronize_full();
         }
 
         is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR;
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index ff95e3192884..9bdddbcb3d6a 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -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: 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);
         if (fd >= 0) {
                 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);