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

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 <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20240214-axi-fan-control-no-of-v1-3-43ca656fe2e3@analog.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Nuno Sa and committed by
Guenter Roeck
ec823656 0b5f91d4

+18 -22
+18 -22
drivers/hwmon/axi-fan-control.c
··· 466 466 return PTR_ERR(ctl->base); 467 467 468 468 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"); 473 472 474 473 ctl->clk_rate = clk_get_rate(clk); 475 474 if (!ctl->clk_rate) ··· 476 477 477 478 version = axi_ioread(ADI_AXI_REG_VERSION, ctl); 478 479 if (ADI_AXI_PCORE_VER_MAJOR(version) != 479 - ADI_AXI_PCORE_VER_MAJOR((*id))) { 480 - dev_err(&pdev->dev, "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", 481 - ADI_AXI_PCORE_VER_MAJOR(*id), 482 - ADI_AXI_PCORE_VER_MINOR(*id), 483 - ADI_AXI_PCORE_VER_PATCH(*id), 484 - ADI_AXI_PCORE_VER_MAJOR(version), 485 - ADI_AXI_PCORE_VER_MINOR(version), 486 - ADI_AXI_PCORE_VER_PATCH(version)); 487 - return -ENODEV; 488 - } 480 + ADI_AXI_PCORE_VER_MAJOR((*id))) 481 + return dev_err_probe(&pdev->dev, -ENODEV, 482 + "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", 483 + ADI_AXI_PCORE_VER_MAJOR(*id), 484 + ADI_AXI_PCORE_VER_MINOR(*id), 485 + ADI_AXI_PCORE_VER_PATCH(*id), 486 + ADI_AXI_PCORE_VER_MAJOR(version), 487 + ADI_AXI_PCORE_VER_MINOR(version), 488 + ADI_AXI_PCORE_VER_PATCH(version)); 489 489 490 490 ret = axi_fan_control_init(ctl, &pdev->dev); 491 - if (ret) { 492 - dev_err(&pdev->dev, "Failed to initialize device\n"); 493 - return ret; 494 - } 491 + if (ret) 492 + return dev_err_probe(&pdev->dev, ret, 493 + "Failed to initialize device\n"); 495 494 496 495 ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev, 497 496 name, ··· 508 511 axi_fan_control_irq_handler, 509 512 IRQF_ONESHOT | IRQF_TRIGGER_HIGH, 510 513 pdev->driver_override, ctl); 511 - if (ret) { 512 - dev_err(&pdev->dev, "failed to request an irq, %d", ret); 513 - return ret; 514 - } 514 + if (ret) 515 + return dev_err_probe(&pdev->dev, ret, 516 + "failed to request an irq\n"); 515 517 516 518 return 0; 517 519 }