From: Bin Meng <bmeng.cn@gmail.com>
Date: Sat, 17 Jun 2017 13:35:59 +0000 (-0700)
Subject: dm: ahci: Avoid scsi_scan_dev() in ahci_probe_scsi()
X-Git-Tag: v2017.09-rc1~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9c1390d4b988b1c7170dca9d06539ea1a363dfe7;p=u-boot

dm: ahci: Avoid scsi_scan_dev() in ahci_probe_scsi()

Running 'scsi scan' command causes scsi_scan_dev() to be called,
from which device_probe() is called and consequently AHCI driver
probe routine will be called as SCSI driver's parent, and finally
ahci_probe_scsi() calls scsi_scan_dev() again.

Remove the call to scsi_scan_dev() in ahci_probe_scsi().

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 6da412d178..606347faac 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1183,11 +1183,6 @@ int ahci_probe_scsi(struct udevice *ahci_dev)
 	ret = ahci_start_ports(uc_priv);
 	if (ret)
 		return ret;
-
-	debug("Scanning %s\n", dev->name);
-	ret = scsi_scan_dev(dev, true);
-	if (ret)
-		return ret;
 #endif
 
 	return 0;