ARM: OMAP5+: sata: Move scsi_scan() to the right place

scsi_scan() must be called as part of scsi_init() and not
as part of sata_init().

Signed-off-by: Roger Quadros <rogerq@ti.com>

diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c
index 131d082bc8900c8153dbc3aac0641238a4094763..3b4dd3f5d77d22157a425bf7a06ec1ed637eb320 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/sata.c
+++ b/arch/arm/cpu/armv7/omap-common/sata.c
@@ -70,7 +70,6 @@ int init_sata(int dev)
        writel(val, TI_SATA_WRAPPER_BASE + TI_SATA_SYSCONFIG);
 
        ret = ahci_init(DWC_AHSATA_BASE);
-       scsi_scan(1);
 
        return ret;
 }
@@ -79,4 +78,5 @@ int init_sata(int dev)
 void scsi_init(void)
 {
        init_sata(0);
+       scsi_scan(1);
 }