diff options
| author | Simon Glass <sjg@chromium.org> | 2017-06-14 21:28:37 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-07-11 10:08:19 -0600 |
| commit | 7cf1afce7fa3fe64189020fe14b93f7326dd0758 (patch) | |
| tree | 5ebfa4fe9113898c4bb7ae87df1f21ede879fbdf /include/scsi.h | |
| parent | 62b4ec8e302c7d616e37f2c2c2836edfea712309 (diff) | |
| download | u-boot-7cf1afce7fa3fe64189020fe14b93f7326dd0758.tar.gz | |
dm: ahci: Unwind the confusing init code
Two AHCI drivers use SCSI with CONFIG_DM_SCSI. The SCSI uclass calls
scsi_low_level_init() which is implemented by ahci.c. If
CONFIG_SCSI_AHCI_PLAT is defined it does one thing and if it is not
it does something else.
We don't need to call through scsi_low_level_init() to get the init
completed. Instead, adjust the two drivers to call into AHCI directly.
Drop the post-probe init in the SCSI uclass. This means that driver model
doesn't need to use scsi_low_level_init(). It is a legacy function and
driver model should use a driver's probe() method instead.
While we are here, add a comment to the top of the file explaining what
ahci.c does.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'include/scsi.h')
| -rw-r--r-- | include/scsi.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/scsi.h b/include/scsi.h index bc5be97465..cd1b240855 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -171,9 +171,7 @@ struct scsi_platdata { unsigned long max_id; }; -#if defined(CONFIG_DM_SCSI) -void scsi_low_level_init(int busdevfunc, struct udevice *dev); -#else +#ifndef CONFIG_DM_SCSI void scsi_low_level_init(int busdevfunc); void scsi_init(void); #endif |