Skip to content

Commit ec82365

Browse files
nunojsagroeck
authored andcommitted
hwmon: (axi-fan-control) Make use of dev_err_probe()
Use dev_err_probe() to slightly simplify printing errors during probe. No functional changes intended. Signed-off-by: Nuno Sa <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]>
1 parent 0b5f91d commit ec82365

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

drivers/hwmon/axi-fan-control.c

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -466,33 +466,30 @@ static int axi_fan_control_probe(struct platform_device *pdev)
466466
return PTR_ERR(ctl->base);
467467

468468
clk = devm_clk_get_enabled(&pdev->dev, NULL);
469-
if (IS_ERR(clk)) {
470-
dev_err(&pdev->dev, "clk_get failed with %ld\n", PTR_ERR(clk));
471-
return PTR_ERR(clk);
472-
}
469+
if (IS_ERR(clk))
470+
return dev_err_probe(&pdev->dev, PTR_ERR(clk),
471+
"clk_get failed\n");
473472

474473
ctl->clk_rate = clk_get_rate(clk);
475474
if (!ctl->clk_rate)
476475
return -EINVAL;
477476

478477
version = axi_ioread(ADI_AXI_REG_VERSION, ctl);
479478
if (ADI_AXI_PCORE_VER_MAJOR(version) !=
480-
ADI_AXI_PCORE_VER_MAJOR((*id))) {
481-
dev_err(&pdev->dev, "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n",
482-
ADI_AXI_PCORE_VER_MAJOR(*id),
483-
ADI_AXI_PCORE_VER_MINOR(*id),
484-
ADI_AXI_PCORE_VER_PATCH(*id),
485-
ADI_AXI_PCORE_VER_MAJOR(version),
486-
ADI_AXI_PCORE_VER_MINOR(version),
487-
ADI_AXI_PCORE_VER_PATCH(version));
488-
return -ENODEV;
489-
}
479+
ADI_AXI_PCORE_VER_MAJOR((*id)))
480+
return dev_err_probe(&pdev->dev, -ENODEV,
481+
"Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n",
482+
ADI_AXI_PCORE_VER_MAJOR(*id),
483+
ADI_AXI_PCORE_VER_MINOR(*id),
484+
ADI_AXI_PCORE_VER_PATCH(*id),
485+
ADI_AXI_PCORE_VER_MAJOR(version),
486+
ADI_AXI_PCORE_VER_MINOR(version),
487+
ADI_AXI_PCORE_VER_PATCH(version));
490488

491489
ret = axi_fan_control_init(ctl, &pdev->dev);
492-
if (ret) {
493-
dev_err(&pdev->dev, "Failed to initialize device\n");
494-
return ret;
495-
}
490+
if (ret)
491+
return dev_err_probe(&pdev->dev, ret,
492+
"Failed to initialize device\n");
496493

497494
ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev,
498495
name,
@@ -511,10 +508,9 @@ static int axi_fan_control_probe(struct platform_device *pdev)
511508
axi_fan_control_irq_handler,
512509
IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
513510
pdev->driver_override, ctl);
514-
if (ret) {
515-
dev_err(&pdev->dev, "failed to request an irq, %d", ret);
516-
return ret;
517-
}
511+
if (ret)
512+
return dev_err_probe(&pdev->dev, ret,
513+
"failed to request an irq\n");
518514

519515
return 0;
520516
}

0 commit comments

Comments
 (0)