Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: wpcm-fiu: 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/20240826132544.3463616-3-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Jinjie Ruan and committed by
Mark Brown
196d34e2 0f2cf3bc

+6 -8
+6 -8
drivers/spi/spi-wpcm-fiu.c
··· 449 449 fiu->dev = dev; 450 450 451 451 fiu->regs = devm_platform_ioremap_resource_byname(pdev, "control"); 452 - if (IS_ERR(fiu->regs)) { 453 - dev_err(dev, "Failed to map registers\n"); 454 - return PTR_ERR(fiu->regs); 455 - } 452 + if (IS_ERR(fiu->regs)) 453 + return dev_err_probe(dev, PTR_ERR(fiu->regs), 454 + "Failed to map registers\n"); 456 455 457 456 fiu->clk = devm_clk_get_enabled(dev, NULL); 458 457 if (IS_ERR(fiu->clk)) ··· 460 461 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory"); 461 462 fiu->memory = devm_ioremap_resource(dev, res); 462 463 fiu->memory_size = min_t(size_t, resource_size(res), MAX_MEMORY_SIZE_TOTAL); 463 - if (IS_ERR(fiu->memory)) { 464 - dev_err(dev, "Failed to map flash memory window\n"); 465 - return PTR_ERR(fiu->memory); 466 - } 464 + if (IS_ERR(fiu->memory)) 465 + return dev_err_probe(dev, PTR_ERR(fiu->memory), 466 + "Failed to map flash memory window\n"); 467 467 468 468 fiu->shm_regmap = syscon_regmap_lookup_by_phandle_optional(dev->of_node, "nuvoton,shm"); 469 469