| Message ID | 20240703180300.42959-6-james.quinlan@broadcom.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: brcnstb: Enable STB 7712 SOC | expand |
Hi Jim, On 7/3/24 21:02, Jim Quinlan wrote: > Place all of the devm_reset_contol_get*() calls above the calls that > assert the reset controllers. > > Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com> > --- > drivers/pci/controller/pcie-brcmstb.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 69926ee5c961..59daa4b2e6c5 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1644,6 +1644,11 @@ static int brcm_pcie_probe(struct platform_device *pdev) > ret = PTR_ERR(pcie->perst_reset); > goto clk_out; > } > + pcie->bridge = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); > + if (IS_ERR(pcie->bridge)) { > + ret = PTR_ERR(pcie->bridge); > + goto clk_out; > + } > This change must be merged in 3/12 - "PCI: brcmstb: Use bridge reset if available" ~Stan > ret = reset_control_assert(pcie->swinit); > if (ret) { > @@ -1662,12 +1667,6 @@ static int brcm_pcie_probe(struct platform_device *pdev) > goto clk_out; > } > > - pcie->bridge = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); > - if (IS_ERR(pcie->bridge)) { > - ret = PTR_ERR(pcie->bridge); > - goto clk_out; > - } > - > ret = brcm_phy_start(pcie); > if (ret) { > reset_control_rearm(pcie->rescal);
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 69926ee5c961..59daa4b2e6c5 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1644,6 +1644,11 @@ static int brcm_pcie_probe(struct platform_device *pdev) ret = PTR_ERR(pcie->perst_reset); goto clk_out; } + pcie->bridge = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); + if (IS_ERR(pcie->bridge)) { + ret = PTR_ERR(pcie->bridge); + goto clk_out; + } ret = reset_control_assert(pcie->swinit); if (ret) { @@ -1662,12 +1667,6 @@ static int brcm_pcie_probe(struct platform_device *pdev) goto clk_out; } - pcie->bridge = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); - if (IS_ERR(pcie->bridge)) { - ret = PTR_ERR(pcie->bridge); - goto clk_out; - } - ret = brcm_phy_start(pcie); if (ret) { reset_control_rearm(pcie->rescal);
Place all of the devm_reset_contol_get*() calls above the calls that assert the reset controllers. Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com> --- drivers/pci/controller/pcie-brcmstb.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)