PCI: j721e: Use dev_err_probe() in the probe() function

Use dev_err_probe() instead of dev_err() in the probe() function to
simplify the code and standardize the error output.

Link: https://lore.kernel.org/linux-pci/20240102-j7200-pcie-s2r-v7-3-a2f9156da6c3@bootlin.com
Signed-off-by: Thomas Richard <thomas.richard@bootlin.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>

diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c
index 7f7732e2dcaa9d8434a790ffc48bceb8674202ff..46d47285ce74c338d07ba9a2687339d2301e7b3c 100644 (file)
--- a/drivers/pci/controller/cadence/pci-j721e.c
+++ b/drivers/pci/controller/cadence/pci-j721e.c
@@ -519,20 +519,20 @@ static int j721e_pcie_probe(struct platform_device *pdev)
        pm_runtime_enable(dev);
        ret = pm_runtime_get_sync(dev);
        if (ret < 0) {
-               dev_err(dev, "pm_runtime_get_sync failed\n");
+               dev_err_probe(dev, ret, "pm_runtime_get_sync failed\n");
                goto err_get_sync;
        }
 
        ret = j721e_pcie_ctrl_init(pcie);
        if (ret < 0) {
-               dev_err(dev, "pm_runtime_get_sync failed\n");
+               dev_err_probe(dev, ret, "pm_runtime_get_sync failed\n");
                goto err_get_sync;
        }
 
        ret = devm_request_irq(dev, irq, j721e_pcie_link_irq_handler, 0,
                               "j721e-pcie-link-down-irq", pcie);
        if (ret < 0) {
-               dev_err(dev, "failed to request link state IRQ %d\n", irq);
+               dev_err_probe(dev, ret, "failed to request link state IRQ %d\n", irq);
                goto err_get_sync;
        }
 
@@ -542,28 +542,25 @@ static int j721e_pcie_probe(struct platform_device *pdev)
        case PCI_MODE_RC:
                gpiod = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
                if (IS_ERR(gpiod)) {
-                       ret = PTR_ERR(gpiod);
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(dev, "Failed to get reset GPIO\n");
+                       ret = dev_err_probe(dev, PTR_ERR(gpiod), "Failed to get reset GPIO\n");
                        goto err_get_sync;
                }
 
                ret = cdns_pcie_init_phy(dev, cdns_pcie);
                if (ret) {
-                       dev_err(dev, "Failed to init phy\n");
+                       dev_err_probe(dev, ret, "Failed to init phy\n");
                        goto err_get_sync;
                }
 
                clk = devm_clk_get_optional(dev, "pcie_refclk");
                if (IS_ERR(clk)) {
-                       ret = PTR_ERR(clk);
-                       dev_err(dev, "failed to get pcie_refclk\n");
+                       ret = dev_err_probe(dev, PTR_ERR(clk), "failed to get pcie_refclk\n");
                        goto err_pcie_setup;
                }
 
                ret = clk_prepare_enable(clk);
                if (ret) {
-                       dev_err(dev, "failed to enable pcie_refclk\n");
+                       dev_err_probe(dev, ret, "failed to enable pcie_refclk\n");
                        goto err_pcie_setup;
                }
                pcie->refclk = clk;
@@ -591,7 +588,7 @@ static int j721e_pcie_probe(struct platform_device *pdev)
        case PCI_MODE_EP:
                ret = cdns_pcie_init_phy(dev, cdns_pcie);
                if (ret) {
-                       dev_err(dev, "Failed to init phy\n");
+                       dev_err_probe(dev, ret, "Failed to init phy\n");
                        goto err_get_sync;
                }