]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
spi: wpcm-fiu: Simplify with dev_err_probe()
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 26 Aug 2024 13:25:44 +0000 (21:25 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 28 Aug 2024 21:22:24 +0000 (22:22 +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>
Link: https://patch.msgid.link/20240826132544.3463616-3-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-wpcm-fiu.c

index 05c10b3e65158d48b1b335ce8da940a181f0f3e2..a9aee2a6c7dcbcebbe9a2bf8cfc2550808600ac3 100644 (file)
@@ -449,10 +449,9 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
        fiu->dev = dev;
 
        fiu->regs = devm_platform_ioremap_resource_byname(pdev, "control");
-       if (IS_ERR(fiu->regs)) {
-               dev_err(dev, "Failed to map registers\n");
-               return PTR_ERR(fiu->regs);
-       }
+       if (IS_ERR(fiu->regs))
+               return dev_err_probe(dev, PTR_ERR(fiu->regs),
+                                    "Failed to map registers\n");
 
        fiu->clk = devm_clk_get_enabled(dev, NULL);
        if (IS_ERR(fiu->clk))
@@ -461,10 +460,9 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
        fiu->memory = devm_ioremap_resource(dev, res);
        fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL);
-       if (IS_ERR(fiu->memory)) {
-               dev_err(dev, "Failed to map flash memory window\n");
-               return PTR_ERR(fiu->memory);
-       }
+       if (IS_ERR(fiu->memory))
+               return dev_err_probe(dev, PTR_ERR(fiu->memory),
+                              "Failed to map flash memory window\n");
 
        fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm");