From: Simon Glass <sjg@chromium.org>
Date: Mon, 2 Aug 2021 00:54:32 +0000 (-0600)
Subject: pci: scsi: pci: Drop DM_PCI check from scsi
X-Git-Tag: v2025.01-rc5-pxa1908~1759^2~10
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=eb4b7fa0ae50187e63e2f712409ebb63e1b77119;p=u-boot.git

pci: scsi: pci: Drop DM_PCI check from scsi

We don't need this check anymore since when PCI is enabled, driver model
is always used.

Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ce69750c7f..d93d241928 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -284,7 +284,6 @@ void scsi_init(void)
 	 */
 	for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
 		/* get PCI Device ID */
-#ifdef CONFIG_DM_PCI
 		struct udevice *dev;
 		int ret;
 
@@ -294,11 +293,6 @@ void scsi_init(void)
 			busdevfunc = dm_pci_get_bdf(dev);
 			break;
 		}
-#else
-		busdevfunc = pci_find_device(scsi_device_list[i].vendor,
-					     scsi_device_list[i].device,
-					     0);
-#endif
 		if (busdevfunc != -1)
 			break;
 	}