aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2012-07-09 22:33:40 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-07-20 04:25:22 -0400
commit492d542273a4859f8bf8cc7744cdf71ef50b39ea (patch)
tree443e4a40bcb4217e74f20af38d42141568d51f98
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>
-rw-r--r--drivers/base/dd.c2
-rw-r--r--drivers/scsi/scsi_scan.c12
-rw-r--r--include/scsi/scsi_scan.h11
3 files changed, 0 insertions, 25 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 @@
24#include <linux/wait.h> 24#include <linux/wait.h>
25#include <linux/async.h> 25#include <linux/async.h>
26#include <linux/pm_runtime.h> 26#include <linux/pm_runtime.h>
27#include <scsi/scsi_scan.h>
28 27
29#include "base.h" 28#include "base.h"
30#include "power/power.h" 29#include "power/power.h"
@@ -333,7 +332,6 @@ void wait_for_device_probe(void)
333 /* wait for the known devices to complete their probing */ 332 /* wait for the known devices to complete their probing */
334 wait_event(probe_waitqueue, atomic_read(&probe_count) == 0); 333 wait_event(probe_waitqueue, atomic_read(&probe_count) == 0);
335 async_synchronize_full(); 334 async_synchronize_full();
336 scsi_complete_async_scans();
337} 335}
338EXPORT_SYMBOL_GPL(wait_for_device_probe); 336EXPORT_SYMBOL_GPL(wait_for_device_probe);
339 337
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index dff17c198a72..a0bc66372654 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -187,18 +187,6 @@ int scsi_complete_async_scans(void)
187 return 0; 187 return 0;
188} 188}
189 189
190/* Only exported for the benefit of scsi_wait_scan */
191EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
192
193#ifndef MODULE
194/*
195 * For async scanning we need to wait for all the scans to complete before
196 * trying to mount the root fs. Otherwise non-modular drivers may not be ready
197 * yet.
198 */
199late_initcall(scsi_complete_async_scans);
200#endif
201
202/** 190/**
203 * scsi_unlock_floptical - unlock device via a special MODE SENSE command 191 * scsi_unlock_floptical - unlock device via a special MODE SENSE command
204 * @sdev: scsi device to send command to 192 * @sdev: scsi device to send command to
diff --git a/include/scsi/scsi_scan.h b/include/scsi/scsi_scan.h
deleted file mode 100644
index 78898889243d..000000000000
--- a/include/scsi/scsi_scan.h
+++ /dev/null
@@ -1,11 +0,0 @@
1#ifndef _SCSI_SCSI_SCAN_H
2#define _SCSI_SCSI_SCAN_H
3
4#ifdef CONFIG_SCSI
5/* drivers/scsi/scsi_scan.c */
6extern int scsi_complete_async_scans(void);
7#else
8static inline int scsi_complete_async_scans(void) { return 0; }
9#endif
10
11#endif /* _SCSI_SCSI_SCAN_H */