Re: [PATCH v4 2/9] pci: pwrctrl: slot: fix dev_err_probe() usage
From: Manivannan Sadhasivam
Date: Mon Feb 16 2026 - 11:28:21 EST
On Mon, Feb 16, 2026 at 03:21:46PM +0100, Neil Armstrong wrote:
> 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@xxxxxxxxxx>
> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxxxxxxxx>
> Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Reviewed-by: Manivannan Sadhasivam <mani@xxxxxxxxxx>
- Mani
> ---
> 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
>
--
மணிவண்ணன் சதாசிவம்