spi: zynqmp-gqspi: Simplify with dev_err_probe()
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 26 Aug 2024 12:14:21 +0000 (20:14 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 30 Aug 2024 14:14:18 +0000 (15:14 +0100)
Use the dev_err_probe() helper to simplify error handling during probe.
This also handle scenario, when EDEFER is returned and useless error
is printed.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Acked-by: Michal Simek <michal.simek@amd.com>
Link: https://patch.msgid.link/20240826121421.3384792-3-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-zynqmp-gqspi.c

index 0448bcb2b45c5d207842475c139724f2ff1aa899..e8963e0a6d9a99c959223680c937581995334fb1 100644 (file)
@@ -1242,22 +1242,18 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
                return PTR_ERR(xqspi->regs);
 
        xqspi->pclk = devm_clk_get(&pdev->dev, "pclk");
-       if (IS_ERR(xqspi->pclk)) {
-               dev_err(dev, "pclk clock not found.\n");
-               return PTR_ERR(xqspi->pclk);
-       }
+       if (IS_ERR(xqspi->pclk))
+               return dev_err_probe(dev, PTR_ERR(xqspi->pclk),
+                                    "pclk clock not found.\n");
 
        xqspi->refclk = devm_clk_get(&pdev->dev, "ref_clk");
-       if (IS_ERR(xqspi->refclk)) {
-               dev_err(dev, "ref_clk clock not found.\n");
-               return PTR_ERR(xqspi->refclk);
-       }
+       if (IS_ERR(xqspi->refclk))
+               return dev_err_probe(dev, PTR_ERR(xqspi->refclk),
+                                    "ref_clk clock not found.\n");
 
        ret = clk_prepare_enable(xqspi->pclk);
-       if (ret) {
-               dev_err(dev, "Unable to enable APB clock.\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Unable to enable APB clock.\n");
 
        ret = clk_prepare_enable(xqspi->refclk);
        if (ret) {