Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[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 eea03c20ae 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>
This commit is contained in:
Dan Williams 2012-07-09 19:33:40 -07:00 committed by James Bottomley
parent 6cdd55205d
commit 492d542273
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/dd.c
View File

@ -24,7 +24,6 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/async.h> #include <linux/async.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <scsi/scsi_scan.h>
#include "base.h" #include "base.h"
#include "power/power.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 for the known devices to complete their probing */
wait_event(probe_waitqueue, atomic_read(&probe_count) == 0); wait_event(probe_waitqueue, atomic_read(&probe_count) == 0);
async_synchronize_full(); async_synchronize_full();
scsi_complete_async_scans();
} }
EXPORT_SYMBOL_GPL(wait_for_device_probe); EXPORT_SYMBOL_GPL(wait_for_device_probe);

12
drivers/scsi/scsi_scan.c
View File

@ -187,18 +187,6 @@ int scsi_complete_async_scans(void)
return 0; 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 * scsi_unlock_floptical - unlock device via a special MODE SENSE command
* @sdev: scsi device to send command to * @sdev: scsi device to send command to

11
include/scsi/scsi_scan.h
View File

@ -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 */