Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: (axi-fan-control) Make use of dev_err_probe()

Browse Source 
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>
This commit is contained in:
Nuno Sa 2024-02-14 15:36:45 +01:00 committed by Guenter Roeck
parent 0b5f91d47d
commit ec823656c1
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/hwmon/axi-fan-control.c
View File

@ -466,10 +466,9 @@ static int axi_fan_control_probe(struct platform_device *pdev)
return PTR_ERR(ctl->base); return PTR_ERR(ctl->base);
clk = devm_clk_get_enabled(&pdev->dev, NULL); clk = devm_clk_get_enabled(&pdev->dev, NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk))
dev_err(&pdev->dev, "clk_get failed with %ld\n", PTR_ERR(clk)); return dev_err_probe(&pdev->dev, PTR_ERR(clk),
return PTR_ERR(clk); "clk_get failed\n");
}
ctl->clk_rate = clk_get_rate(clk); ctl->clk_rate = clk_get_rate(clk);
if (!ctl->clk_rate) if (!ctl->clk_rate)
@ -477,22 +476,20 @@ static int axi_fan_control_probe(struct platform_device *pdev)
version = axi_ioread(ADI_AXI_REG_VERSION, ctl); version = axi_ioread(ADI_AXI_REG_VERSION, ctl);
if (ADI_AXI_PCORE_VER_MAJOR(version) != if (ADI_AXI_PCORE_VER_MAJOR(version) !=
ADI_AXI_PCORE_VER_MAJOR((*id))) { ADI_AXI_PCORE_VER_MAJOR((*id)))
dev_err(&pdev->dev, "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", return dev_err_probe(&pdev->dev, -ENODEV,
ADI_AXI_PCORE_VER_MAJOR(*id), "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n",
ADI_AXI_PCORE_VER_MINOR(*id), ADI_AXI_PCORE_VER_MAJOR(*id),
ADI_AXI_PCORE_VER_PATCH(*id), ADI_AXI_PCORE_VER_MINOR(*id),
ADI_AXI_PCORE_VER_MAJOR(version), ADI_AXI_PCORE_VER_PATCH(*id),
ADI_AXI_PCORE_VER_MINOR(version), ADI_AXI_PCORE_VER_MAJOR(version),
ADI_AXI_PCORE_VER_PATCH(version)); ADI_AXI_PCORE_VER_MINOR(version),
return -ENODEV; ADI_AXI_PCORE_VER_PATCH(version));
}
ret = axi_fan_control_init(ctl, &pdev->dev); ret = axi_fan_control_init(ctl, &pdev->dev);
if (ret) { if (ret)
dev_err(&pdev->dev, "Failed to initialize device\n"); return dev_err_probe(&pdev->dev, ret,
return ret; "Failed to initialize device\n");
}
ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev, ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev,
name, name,
@ -511,10 +508,9 @@ static int axi_fan_control_probe(struct platform_device *pdev)
axi_fan_control_irq_handler, axi_fan_control_irq_handler,
IRQF_ONESHOT | IRQF_TRIGGER_HIGH, IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
pdev->driver_override, ctl); pdev->driver_override, ctl);
if (ret) { if (ret)
dev_err(&pdev->dev, "failed to request an irq, %d", ret); return dev_err_probe(&pdev->dev, ret,
return ret; "failed to request an irq\n");
}
return 0; return 0;
} }