]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI/pwrctrl: generic: Simplify dev_err_probe() usage
authorNeil Armstrong <neil.armstrong@linaro.org>
Fri, 20 Feb 2026 15:04:41 +0000 (16:04 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Mar 2026 17:11:14 +0000 (12:11 -0500)
dev_err_probe() returns the error code passed to it, so this:

  dev_err_probe(dev, ret, "Failed to get slot regulators\n");
  return ret;

is equivalent to this:

  return dev_err_probe(dev, ret, "Failed to get slot regulators\n");

Simplify by using the latter.

Suggested-by: Bartosz Golaszewski <brgl@kernel.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Link: https://patch.msgid.link/20260220-topic-sm8650-ayaneo-pocket-s2-base-v5-2-1ad79caa1efa@linaro.org
drivers/pci/pwrctrl/generic.c

index 082af81efe254d7a505d0762c0abb04d046d0625..f03debabbc733467b2bee6dd3c54ab748fef065b 100644 (file)
@@ -88,18 +88,15 @@ static int slot_pwrctrl_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;
 
        slot->clk = devm_clk_get_optional(dev, NULL);
-       if (IS_ERR(slot->clk)) {
+       if (IS_ERR(slot->clk))
                return dev_err_probe(dev, PTR_ERR(slot->clk),
                                     "Failed to enable slot clock\n");
-       }
 
 skip_resources:
        slot->pwrctrl.power_on = slot_pwrctrl_power_on;