summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2012-07-09 19:33:40 -0700
committerJames Bottomley <JBottomley@Parallels.com>2012-07-20 09:25:22 +0100
commit492d542273a4859f8bf8cc7744cdf71ef50b39ea (patch)
tree443e4a40bcb4217e74f20af38d42141568d51f98 /drivers/base
parent6cdd55205d160f63003c321fcea608336953dd5b (diff)
[SCSI] cleanup usages of scsi_complete_async_scans
Now that scsi registers its async scan work with the async subsystem, wait_for_device_probe() is sufficient for ensuring all scanning is complete. [jejb: fix merge problems with eea03c20ae38 Make wait_for_device_probe() also do scsi_complete_async_scans()] Signed-off-by: Dan Williams <dan.j.williams@intel.com> Tested-by: Eldad Zack <eldad@fogrefinery.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 4b01ab3d2c24..dcb8a6e48692 100644
--- a/drivers/base/dd.c
+++ b/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);