]> git.sur5r.net Git - u-boot/commitdiff
dm: ahci: Avoid scsi_scan_dev() in ahci_probe_scsi()
authorBin Meng <bmeng.cn@gmail.com>
Sat, 17 Jun 2017 13:35:59 +0000 (06:35 -0700)
committerSimon Glass <sjg@chromium.org>
Fri, 28 Jul 2017 18:02:47 +0000 (12:02 -0600)
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>
drivers/ata/ahci.c

index 6da412d178cc65a3b0a0d67b2a487c2a9589abdc..606347faac049d6e07c65e98cacc65ddef90cc67 100644 (file)
@@ -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;