spi: atmel-quadspi: Simplify with dev_err_probe()

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>
Link: https://patch.msgid.link/20240826125913.3434305-3-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 56dd8dcb86cbe0d2cc92864bbd7b5c00099682a5..936d578694931a61b96d559a0a7b040e1a9eff8b 100644 (file)
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -602,18 +602,16 @@ static int atmel_qspi_probe(struct platform_device *pdev)
 
        /* Map the registers */
        aq->regs = devm_platform_ioremap_resource_byname(pdev, "qspi_base");
-       if (IS_ERR(aq->regs)) {
-               dev_err(&pdev->dev, "missing registers\n");
-               return PTR_ERR(aq->regs);
-       }
+       if (IS_ERR(aq->regs))
+               return dev_err_probe(&pdev->dev, PTR_ERR(aq->regs),
+                                    "missing registers\n");
 
        /* Map the AHB memory */
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap");
        aq->mem = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(aq->mem)) {
-               dev_err(&pdev->dev, "missing AHB memory\n");
-               return PTR_ERR(aq->mem);
-       }
+       if (IS_ERR(aq->mem))
+               return dev_err_probe(&pdev->dev, PTR_ERR(aq->mem),
+                                    "missing AHB memory\n");
 
        aq->mmap_size = resource_size(res);
 
@@ -622,17 +620,15 @@ static int atmel_qspi_probe(struct platform_device *pdev)
        if (IS_ERR(aq->pclk))
                aq->pclk = devm_clk_get(&pdev->dev, NULL);
 
-       if (IS_ERR(aq->pclk)) {
-               dev_err(&pdev->dev, "missing peripheral clock\n");
-               return PTR_ERR(aq->pclk);
-       }
+       if (IS_ERR(aq->pclk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(aq->pclk),
+                                    "missing peripheral clock\n");
 
        /* Enable the peripheral clock */
        err = clk_prepare_enable(aq->pclk);
-       if (err) {
-               dev_err(&pdev->dev, "failed to enable the peripheral clock\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err,
+                                    "failed to enable the peripheral clock\n");
 
        aq->caps = of_device_get_match_data(&pdev->dev);
        if (!aq->caps) {