ata: ahci_brcm: Perform reset after obtaining resources

Resources such as clocks, PHYs, regulators are likely to get a probe
deferral return code, which could lead to the AHCI controller being
reset a few times until it gets successfully probed. Since this is
typically the most time consuming operation, move it after the resources
have been acquired.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index 7ac1141c6ad00f613019f9a9e09e5f4ba993539a..e32c8fe729fffa8cc0f105e94b109f0763c2c3ec 100644 (file)
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -456,13 +456,9 @@ static int brcm_ahci_probe(struct platform_device *pdev)
        if (IS_ERR(priv->rcdev))
                return PTR_ERR(priv->rcdev);
 
-       reset_control_deassert(priv->rcdev);
-
        hpriv = ahci_platform_get_resources(pdev, 0);
-       if (IS_ERR(hpriv)) {
-               ret = PTR_ERR(hpriv);
-               goto out_reset;
-       }
+       if (IS_ERR(hpriv))
+               return PTR_ERR(hpriv);
 
        hpriv->plat_data = priv;
        hpriv->flags = AHCI_HFLAG_WAKE_BEFORE_STOP | AHCI_HFLAG_NO_WRITE_TO_RO;
@@ -479,6 +475,10 @@ static int brcm_ahci_probe(struct platform_device *pdev)
                break;
        }
 
+       ret = reset_control_deassert(priv->rcdev);
+       if (ret)
+               return ret;
+
        ret = ahci_platform_enable_clks(hpriv);
        if (ret)
                goto out_reset;