diff options
| author | Neil Armstrong <neil.armstrong@linaro.org> | 2026-02-20 18:04:41 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2026-03-18 20:11:14 +0300 |
| commit | 0862e2b06cd88491e2e854a24219219b8aa6e0b5 (patch) | |
| tree | f1c4489e98281526f5a0b90bec5b93a573d25e34 | |
| parent | ff124bbbca1d3a07fa1392ffdbbdeece71f68ece (diff) | |
| download | linux-0862e2b06cd88491e2e854a24219219b8aa6e0b5.tar.xz | |
PCI/pwrctrl: generic: Simplify dev_err_probe() usage
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
| -rw-r--r-- | drivers/pci/pwrctrl/generic.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pci/pwrctrl/generic.c b/drivers/pci/pwrctrl/generic.c index 082af81efe25..f03debabbc73 100644 --- a/drivers/pci/pwrctrl/generic.c +++ b/drivers/pci/pwrctrl/generic.c @@ -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; |