diff options
| author | Simon Glass <sjg@chromium.org> | 2017-06-14 21:28:47 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-07-11 10:08:19 -0600 |
| commit | 7337fcd8c0aeee0a90eb2e986bde5eb7177b8552 (patch) | |
| tree | dea211ece499e6861bf3cc5f484515cf39e506e6 /drivers/scsi | |
| parent | 681357ffd9fe4528d020a878ef6ee61f519d8d85 (diff) | |
| download | u-boot-7337fcd8c0aeee0a90eb2e986bde5eb7177b8552.tar.gz u-boot-7337fcd8c0aeee0a90eb2e986bde5eb7177b8552.tar.xz u-boot-7337fcd8c0aeee0a90eb2e986bde5eb7177b8552.zip | |
dm: scsi: Drop scsi_init() when driver model is used
This function should not be used with driver model. Update the code to
reflect this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 2b87548bd3..7ec7ecc295 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -29,7 +29,8 @@ # endif #endif -#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \ + !defined(CONFIG_DM_SCSI) const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST }; #endif static struct scsi_cmd tempccb; /* temporary scsi command buffer */ @@ -274,7 +275,8 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr, return blkcnt; } -#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \ + !defined(CONFIG_DM_SCSI) void scsi_init(void) { int busdevfunc = -1; |