On Thu, Aug 15, 2024 at 06:57:17PM -0400, Jim Quinlan wrote:
> 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. dev_err_probe() is also used when it is apt.
>
> Signed-off-by: Jim Quinlan <james.quinlan@xxxxxxxxxxxx>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
> ---
> drivers/pci/controller/pcie-brcmstb.c | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index c08683febdd4..790a149f6581 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -1613,25 +1613,23 @@ static int brcm_pcie_probe(struct platform_device *pdev)
>
> pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
>
> - ret = clk_prepare_enable(pcie->clk);
> - if (ret) {
> - dev_err(&pdev->dev, "could not enable clock\n");
> - return ret;
> - }
> pcie->rescal = devm_reset_control_get_optional_shared(&pdev->dev, "rescal");
> - if (IS_ERR(pcie->rescal)) {
> - clk_disable_unprepare(pcie->clk);
> + if (IS_ERR(pcie->rescal))
> return PTR_ERR(pcie->rescal);
> - }
> +
> pcie->perst_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "perst");
> - if (IS_ERR(pcie->perst_reset)) {
> - clk_disable_unprepare(pcie->clk);
> + if (IS_ERR(pcie->perst_reset))
> return PTR_ERR(pcie->perst_reset);
> - }
>
> - ret = reset_control_reset(pcie->rescal);
> + ret = clk_prepare_enable(pcie->clk);
> if (ret)
> - dev_err(&pdev->dev, "failed to deassert 'rescal'\n");
> + return dev_err_probe(&pdev->dev, ret, "could not enable clock\n");
> +
> + ret = reset_control_reset(pcie->rescal);
> + if (ret) {
> + clk_disable_unprepare(pcie->clk);
> + return dev_err_probe(&pdev->dev, ret, "failed to deassert 'rescal'\n");
> + }
>
> ret = brcm_phy_start(pcie);
> if (ret) {
> @@ -1678,6 +1676,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
>
> fail:
> __brcm_pcie_remove(pcie);
> +
Irrelevant change in this patch.
- Mani
> return ret;
> }
>
> --
> 2.17.1
>
--
மணிவண்ணன் சதாசிவம்
