Skip to content

Commit 64706ba

Browse files
jamesequinlankwilczynski
authored andcommitted
PCI: brcmstb: Use common error handling code in brcm_pcie_probe()
Refactor the error handling in the bottom half of the probe function for readability. The invocation of clk_prepare_enable() is moved lower in the function and this simplifies a couple of return paths. The dev_err_probe() is also used when it is apt. Link: https://lore.kernel.org/linux-pci/20240815225731.40276-5-james.quinlan@broadcom.com Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com> [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1 parent 56d0202 commit 64706ba

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,25 +1613,23 @@ static int brcm_pcie_probe(struct platform_device *pdev)
16131613

16141614
pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
16151615

1616-
ret = clk_prepare_enable(pcie->clk);
1617-
if (ret) {
1618-
dev_err(&pdev->dev, "could not enable clock\n");
1619-
return ret;
1620-
}
16211616
pcie->rescal = devm_reset_control_get_optional_shared(&pdev->dev, "rescal");
1622-
if (IS_ERR(pcie->rescal)) {
1623-
clk_disable_unprepare(pcie->clk);
1617+
if (IS_ERR(pcie->rescal))
16241618
return PTR_ERR(pcie->rescal);
1625-
}
1619+
16261620
pcie->perst_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "perst");
1627-
if (IS_ERR(pcie->perst_reset)) {
1628-
clk_disable_unprepare(pcie->clk);
1621+
if (IS_ERR(pcie->perst_reset))
16291622
return PTR_ERR(pcie->perst_reset);
1630-
}
16311623

1632-
ret = reset_control_reset(pcie->rescal);
1624+
ret = clk_prepare_enable(pcie->clk);
16331625
if (ret)
1634-
dev_err(&pdev->dev, "failed to deassert 'rescal'\n");
1626+
return dev_err_probe(&pdev->dev, ret, "could not enable clock\n");
1627+
1628+
ret = reset_control_reset(pcie->rescal);
1629+
if (ret) {
1630+
clk_disable_unprepare(pcie->clk);
1631+
return dev_err_probe(&pdev->dev, ret, "failed to deassert 'rescal'\n");
1632+
}
16351633

16361634
ret = brcm_phy_start(pcie);
16371635
if (ret) {
@@ -1678,6 +1676,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
16781676

16791677
fail:
16801678
__brcm_pcie_remove(pcie);
1679+
16811680
return ret;
16821681
}
16831682

0 commit comments

Comments
 (0)