Message ID | 20200106185857.11128-2-f.fainelli@gmail.com |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Series | ata: ahci_brcm: Follow-up changes for BCM7216 | expand |
On 1/6/20 10:58 AM, Florian Fainelli wrote: > 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> > --- > drivers/ata/ahci_brcm.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c > index 13ceca687104..c3137ec9fb1c 100644 > --- a/drivers/ata/ahci_brcm.c > +++ b/drivers/ata/ahci_brcm.c > @@ -453,10 +453,6 @@ static int brcm_ahci_probe(struct platform_device *pdev) > else > reset_name = "ahci"; > > - priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); > - if (!IS_ERR_OR_NULL(priv->rcdev)) > - reset_control_deassert(priv->rcdev); > - > hpriv = ahci_platform_get_resources(pdev, 0); > if (IS_ERR(hpriv)) { > ret = PTR_ERR(hpriv); > @@ -478,6 +474,10 @@ static int brcm_ahci_probe(struct platform_device *pdev) > break; > } I forgot to update the error label path because of this move I will submit a v2 shortly, sorry about that.
diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index 13ceca687104..c3137ec9fb1c 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -453,10 +453,6 @@ static int brcm_ahci_probe(struct platform_device *pdev) else reset_name = "ahci"; - priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); - if (!IS_ERR_OR_NULL(priv->rcdev)) - reset_control_deassert(priv->rcdev); - hpriv = ahci_platform_get_resources(pdev, 0); if (IS_ERR(hpriv)) { ret = PTR_ERR(hpriv); @@ -478,6 +474,10 @@ static int brcm_ahci_probe(struct platform_device *pdev) break; } + priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); + if (!IS_ERR_OR_NULL(priv->rcdev)) + reset_control_deassert(priv->rcdev); + ret = ahci_platform_enable_clks(hpriv); if (ret) goto out_reset;
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> --- drivers/ata/ahci_brcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)