[PATCH v3 2/9] pci: pwrctrl: slot: fix dev_err_probe() usage
From: Neil Armstrong <neil.armstrong@linaro.org>
Date: 2026-02-06 14:50:42
Also in:
linux-arm-msm, linux-pci, linux-renesas-soc, linux-usb, lkml
Subsystem:
pci power control, pci subsystem, the rest · Maintainers:
Bartosz Golaszewski, Manivannan Sadhasivam, Bjorn Helgaas, Linus Torvalds
The code was not returning dev_err_probe() but dev_err_probe() returns the error code, so simplify the code. Suggested-by: Bartosz Golaszewski <brgl@kernel.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- drivers/pci/pwrctrl/slot.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/pwrctrl/slot.c b/drivers/pci/pwrctrl/slot.c
index 3320494b62d8..08e53243cdbd 100644
--- a/drivers/pci/pwrctrl/slot.c
+++ b/drivers/pci/pwrctrl/slot.c@@ -40,17 +40,14 @@ static int pci_pwrctrl_slot_probe(struct platform_device *pdev) ret = of_regulator_bulk_get_all(dev, dev_of_node(dev), &slot->supplies); - if (ret < 0) { - dev_err_probe(dev, ret, "Failed to get slot regulators\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get slot regulators\n"); slot->num_supplies = ret; ret = regulator_bulk_enable(slot->num_supplies, slot->supplies); if (ret < 0) { - dev_err_probe(dev, ret, "Failed to enable slot regulators\n"); regulator_bulk_free(slot->num_supplies, slot->supplies); - return ret; + return dev_err_probe(dev, ret, "Failed to enable slot regulators\n"); } ret = devm_add_action_or_reset(dev, devm_pci_pwrctrl_slot_power_off,
@@ -59,10 +56,9 @@ static int pci_pwrctrl_slot_probe(struct platform_device *pdev) return ret; clk = devm_clk_get_optional_enabled(dev, NULL); - if (IS_ERR(clk)) { + if (IS_ERR(clk)) return dev_err_probe(dev, PTR_ERR(clk), "Failed to enable slot clock\n"); - } pci_pwrctrl_init(&slot->ctx, dev);
--
2.34.1