From: Simon Glass <sjg@chromium.org>
Date: Thu, 15 Jun 2017 03:28:47 +0000 (-0600)
Subject: dm: scsi: Drop scsi_init() when driver model is used
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7337fcd8c0aeee0a90eb2e986bde5eb7177b8552;p=project%2Fbcm63xx%2Fu-boot.git

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

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;