summaryrefslogtreecommitdiffstats
path: root/include/scsi
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 /include/scsi
parent6cdd55205d160f63003c321fcea608336953dd5b (diff)
downloadlinux-492d542273a4859f8bf8cc7744cdf71ef50b39ea.tar.gz
linux-492d542273a4859f8bf8cc7744cdf71ef50b39ea.tar.bz2
linux-492d542273a4859f8bf8cc7744cdf71ef50b39ea.zip
[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 'include/scsi')
-rw-r--r--include/scsi/scsi_scan.h11
1 files changed, 0 insertions, 11 deletions
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 @@
-#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 */