From bdf7da4c6ea731953916f37b6582ace2671e0807 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Mon, 9 Jul 2012 19:33:40 -0700
Subject: [PATCH] --- yaml --- r: 316846 b: refs/heads/master c:
 492d542273a4859f8bf8cc7744cdf71ef50b39ea h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/base/dd.c        |  2 --
 trunk/drivers/scsi/scsi_scan.c | 12 ------------
 trunk/include/scsi/scsi_scan.h | 11 -----------
 4 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 trunk/include/scsi/scsi_scan.h

diff --git a/[refs] b/[refs]
index 5eba24d72b1d..e01f7f0f705f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cdd55205d160f63003c321fcea608336953dd5b
+refs/heads/master: 492d542273a4859f8bf8cc7744cdf71ef50b39ea
diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c
index 4b01ab3d2c24..dcb8a6e48692 100644
--- a/trunk/drivers/base/dd.c
+++ b/trunk/drivers/base/dd.c
@@ -24,7 +24,6 @@
 #include <linux/wait.h>
 #include <linux/async.h>
 #include <linux/pm_runtime.h>
-#include <scsi/scsi_scan.h>
 
 #include "base.h"
 #include "power/power.h"
@@ -333,7 +332,6 @@ void wait_for_device_probe(void)
 	/* wait for the known devices to complete their probing */
 	wait_event(probe_waitqueue, atomic_read(&probe_count) == 0);
 	async_synchronize_full();
-	scsi_complete_async_scans();
 }
 EXPORT_SYMBOL_GPL(wait_for_device_probe);
 
diff --git a/trunk/drivers/scsi/scsi_scan.c b/trunk/drivers/scsi/scsi_scan.c
index dff17c198a72..a0bc66372654 100644
--- a/trunk/drivers/scsi/scsi_scan.c
+++ b/trunk/drivers/scsi/scsi_scan.c
@@ -187,18 +187,6 @@ int scsi_complete_async_scans(void)
 	return 0;
 }
 
-/* Only exported for the benefit of scsi_wait_scan */
-EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
-
-#ifndef MODULE
-/*
- * For async scanning we need to wait for all the scans to complete before
- * trying to mount the root fs.  Otherwise non-modular drivers may not be ready
- * yet.
- */
-late_initcall(scsi_complete_async_scans);
-#endif
-
 /**
  * scsi_unlock_floptical - unlock device via a special MODE SENSE command
  * @sdev:	scsi device to send command to
diff --git a/trunk/include/scsi/scsi_scan.h b/trunk/include/scsi/scsi_scan.h
deleted file mode 100644
index 78898889243d..000000000000
--- a/trunk/include/scsi/scsi_scan.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _SCSI_SCSI_SCAN_H
-#define _SCSI_SCSI_SCAN_H
-
-#ifdef CONFIG_SCSI
-/* drivers/scsi/scsi_scan.c */
-extern int scsi_complete_async_scans(void);
-#else
-static inline int scsi_complete_async_scans(void) { return 0; }
-#endif
-
-#endif /* _SCSI_SCSI_SCAN_H */