Skip to contentSkip to conversation

PCI/pwrctrl: Propagate dev_err_probe return value

PATCH In review Anand Moon 4 participants 8 messages Oct 18, 2025 – Oct 31, 2025

Subsystems (3)
lore
Share & tools
lore

Anand Moon

author
#0 lore raw

PATCH 1/1 PCI/pwrctrl: Propagate dev_err_probe return value

Ensure that the return value from dev_err_probe() is consistently assigned back to return in all error paths within pci_pwrctrl_slot_probe() function. This ensures the original error code are propagation for debugging.

---
 drivers/pci/pwrctrl/slot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pci/pwrctrl/slot.c +2 -3
index 3320494b62d89..36a6282fd222d 100644
@@ -41,14 +41,13 @@ 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;
+		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");
+		ret = dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
 		regulator_bulk_free(slot->num_supplies, slot->supplies);
 		return ret;
 	}

base-commit: f406055cb18c6e299c4a783fc1effeb16be41803

Signature · 1 line
2.50.1
#1 lore raw

Le 18/10/2025 à 09:02, Anand Moon a écrit :

Quoted 15 lines

Ensure that the return value from dev_err_probe() is consistently assigned back to return in all error paths within pci_pwrctrl_slot_probe() function. This ensures the original error code are propagation for debugging.

---
  drivers/pci/pwrctrl/slot.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pci/pwrctrl/slot.c +0 -0
index 3320494b62d89..36a6282fd222d 100644

drivers/pci/pwrctrl/slot.c static int pci_pwrctrl_slot_probe(struct platform_device *pdev) · line 45

Quoted 7 lines
drivers/pci/pwrctrl/slot.c +1 -2
@@ -41,14 +41,13 @@ 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;
+		return dev_err_probe(dev, ret, "Failed to get slot regulators\n");
  	}

Extra {} are now unneeded.

drivers/pci/pwrctrl/slot.c static int pci_pwrctrl_slot_probe(struct platform_device *pdev) · line 52

Quoted 8 lines
drivers/pci/pwrctrl/slot.c +1 -1
  	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");
+		ret = dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
  		regulator_bulk_free(slot->num_supplies, slot->supplies);
  		return ret;

Doing:
regulator_bulk_free(slot->num_supplies, slot->supplies); return dev_err_probe(dev, ret, "Failed to enable slot regulators\n");

Would be more consistent.

CJ

Quoted 3 lines
drivers/pci/pwrctrl/slot.c +0 -0
  	}
 

base-commit: f406055cb18c6e299c4a783fc1effeb16be41803

#6 lore raw
In reply to Anand Moon
Quoted 4 lines

Ensure that the return value from dev_err_probe() is consistently assigned back to return in all error paths within pci_pwrctrl_slot_probe() function. This ensures the original error code are propagation for debugging.

I find the change description improvable.

I propose to take another source code transformation approach into account.
https://elixir.bootlin.com/linux/v6.17.1/source/drivers/base/core.c#L5031-L5075

Example:
https://elixir.bootlin.com/linux/v6.17.1/source/drivers/pci/pwrctrl/slot.c#L30-L80

	ret = dev_err_probe(dev,
			    of_regulator_bulk_get_all(dev, dev_of_node(dev), &slot->supplies),
			    "Failed to get slot regulators\n");
	if (ret)
		return ret;

Regards,
Markus

#2 lore raw
In reply to Christophe JAILLET
Quoted 9 lines

drivers/pci/pwrctrl/slot.c static int pci_pwrctrl_slot_probe(struct platform_device *pdev) · line 52

Quoted 7 lines
  	slot->num_supplies = ret;
  	ret = regulator_bulk_enable(slot->num_supplies, slot->supplies);
  	if (ret < 0) {
drivers/pci/pwrctrl/slot.c +1 -1
-		dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
+		ret = dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
  		regulator_bulk_free(slot->num_supplies, slot->supplies);
  		return ret;

Doing:

Quoted 4 lines
    		regulator_bulk_free(slot->num_supplies, slot->supplies);
    		return dev_err_probe(dev, ret, "Failed to enable slot regulators\n");

Would be more consistent.

How does this view fit to the commit ab81f2f79c683c94bac622aafafbe8232e547159 ("PCI/pwrctrl: Fix double cleanup on devm_add_action_or_reset() failure") from 2025-08-13?

Regards,
Markus

author
#3 lore raw

Hi Markus,

Quoted 13 lines · Markus Elfring
Quoted 13 lines

drivers/pci/pwrctrl/slot.c static int pci_pwrctrl_slot_probe(struct platform_device *pdev) · line 52

Quoted 8 lines
    slot->num_supplies = ret;
    ret = regulator_bulk_enable(slot->num_supplies, slot->supplies);
    if (ret < 0) {
drivers/pci/pwrctrl/slot.c +1 -1
-           dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
+           ret = dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
            regulator_bulk_free(slot->num_supplies, slot->supplies);
            return ret;

Doing:

              regulator_bulk_free(slot->num_supplies, slot->supplies);
              return dev_err_probe(dev, ret, "Failed to enable slot regulators\n");
Quoted 6 lines
Quoted 1 line

Would be more consistent.

How does this view fit to the commit ab81f2f79c683c94bac622aafafbe8232e547159 ("PCI/pwrctrl: Fix double cleanup on devm_add_action_or_reset() failure") from 2025-08-13?

Thank you for your guidance. My previous understanding was incorrect.

Quoted 3 lines

Regards,
Markus

Thanks
-Anand

#4 lore raw
Quoted 5 lines
Quoted 4 lines

How does this view fit to the commit ab81f2f79c683c94bac622aafafbe8232e547159 ("PCI/pwrctrl: Fix double cleanup on devm_add_action_or_reset() failure") from 2025-08-13?

Thank you for your guidance. My previous understanding was incorrect.

Will an adjusted software understanding influence further collateral evolutions?

Regards,
Markus

author
#5 lore raw

Hi Markus,

Quoted 9 lines · Markus Elfring
Quoted 6 lines
Quoted 5 lines

How does this view fit to the commit ab81f2f79c683c94bac622aafafbe8232e547159 ("PCI/pwrctrl: Fix double cleanup on devm_add_action_or_reset() failure") from 2025-08-13?

Thank you for your guidance. My previous understanding was incorrect.

Will an adjusted software understanding influence further collateral evolutions?

I will try to be more correct and improve myself.
Sorry for the inconvenience,

Quoted 2 lines

Regards,
Markus

Thanks
-Anand

#7 lore raw
In reply to Anand Moon
Quoted 18 lines · Anand Moon

Ensure that the return value from dev_err_probe() is consistently assigned back to return in all error paths within pci_pwrctrl_slot_probe() function. This ensures the original error code are propagation for debugging.

---
 drivers/pci/pwrctrl/slot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pci/pwrctrl/slot.c +0 -0
index 3320494b62d89..36a6282fd222d 100644
@@ -41,14 +41,13 @@ 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) {

drivers/pci/pwrctrl/slot.c static int pci_pwrctrl_slot_probe(struct platform_device *pdev) · line 50

Quoted 10 lines
drivers/pci/pwrctrl/slot.c +2 -3
-		dev_err_probe(dev, ret, "Failed to get slot regulators\n");
-		return ret;
+		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");
+		ret = dev_err_probe(dev, ret, "Failed to enable slot regulators\n");

Again a pointless change.

- Mani

Signature · 1 line
மணிவண்ணன் சதாசிவம்