The reset and clock paths in rocket_core_init() already use
dev_err_probe(), but the three devm_platform_ioremap_resource_byname()
calls still open-code dev_err() followed by return PTR_ERR(). Convert
them for consistency. dev_err_probe() additionally silences the
-EPROBE_DEFER noise in dmesg and records the failure reason against
the device, where /sys/kernel/debug/devices_deferred can surface it.
Signed-off-by: Abhai Kollara <abhai@protonmail.com>
---
drivers/accel/rocket/rocket_core.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/accel/rocket/rocket_core.c b/drivers/accel/rocket/rocket_core.c
index b3b2fa9ba645..1b27a2c2f435 100644
--- a/drivers/accel/rocket/rocket_core.c
+++ b/drivers/accel/rocket/rocket_core.c
@@ -33,22 +33,19 @@ int rocket_core_init(struct rocket_core *core)
return dev_err_probe(dev, err, "failed to get clocks for core %d\n", core->index);
core->pc_iomem = devm_platform_ioremap_resource_byname(pdev, "pc");
- if (IS_ERR(core->pc_iomem)) {
- dev_err(dev, "couldn't find PC registers %ld\n", PTR_ERR(core->pc_iomem));
- return PTR_ERR(core->pc_iomem);
- }
+ if (IS_ERR(core->pc_iomem))
+ return dev_err_probe(dev, PTR_ERR(core->pc_iomem),
+ "couldn't find PC registers\n");
core->cna_iomem = devm_platform_ioremap_resource_byname(pdev, "cna");
- if (IS_ERR(core->cna_iomem)) {
- dev_err(dev, "couldn't find CNA registers %ld\n", PTR_ERR(core->cna_iomem));
- return PTR_ERR(core->cna_iomem);
- }
+ if (IS_ERR(core->cna_iomem))
+ return dev_err_probe(dev, PTR_ERR(core->cna_iomem),
+ "couldn't find CNA registers\n");
core->core_iomem = devm_platform_ioremap_resource_byname(pdev, "core");
- if (IS_ERR(core->core_iomem)) {
- dev_err(dev, "couldn't find CORE registers %ld\n", PTR_ERR(core->core_iomem));
- return PTR_ERR(core->core_iomem);
- }
+ if (IS_ERR(core->core_iomem))
+ return dev_err_probe(dev, PTR_ERR(core->core_iomem),
+ "couldn't find CORE registers\n");
dma_set_max_seg_size(dev, UINT_MAX);
--
2.43.0