[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>

[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>
Dan Williams · James Bottomley
1 parent 6cdd55205d
Showing 3 changed files with 0 additions and 25 deletions Side-by-side Diff
drivers/base/dd.c
drivers/scsi/scsi_scan.c
include/scsi/scsi_scan.h
@@ -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 @@
 	/* 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);
  
@@ -187,18 +187,6 @@
 	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
-#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 */
...	...	@@ -24,7 +24,6 @@
24	24	#include <linux/wait.h>
25	25	#include <linux/async.h>
26	26	#include <linux/pm_runtime.h>
27		-#include <scsi/scsi_scan.h>
28	27
29	28	#include "base.h"
30	29	#include "power/power.h"
...	...	@@ -333,7 +332,6 @@
333	332	/* wait for the known devices to complete their probing */
334	333	wait_event(probe_waitqueue, atomic_read(&probe_count) == 0);
335	334	async_synchronize_full();
336		- scsi_complete_async_scans();
337	335	}
338	336	EXPORT_SYMBOL_GPL(wait_for_device_probe);
339	337
...	...	@@ -187,18 +187,6 @@
187	187	return 0;
188	188	}
189	189
190		-/* Only exported for the benefit of scsi_wait_scan */
191		-EXPORT_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		- */
199		-late_initcall(scsi_complete_async_scans);
200		-#endif
201		-
202	190	/**
203	191	* scsi_unlock_floptical - unlock device via a special MODE SENSE command
204	192	* @sdev: scsi device to send command to
1		-#ifndef _SCSI_SCSI_SCAN_H
2		-#define _SCSI_SCSI_SCAN_H
3		-
4		-#ifdef CONFIG_SCSI
5		-/* drivers/scsi/scsi_scan.c */
6		-extern int scsi_complete_async_scans(void);
7		-#else
8		-static inline int scsi_complete_async_scans(void) { return 0; }
9		-#endif
10		-
11		-#endif /* _SCSI_SCSI_SCAN_H */