[PATCH v4 2/3] PCI/sysfs: Use runtime PM guard macro for auto-cleanup

From: Rafael J. Wysocki

Date: Fri Sep 26 2025 - 12:27:49 EST


From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

Use the newly introduced pm_runtime_active_try guard to simplify
the code and add the proper error handling for PM runtime resume
errors.

Based on an earlier patch from Takashi Iwai <tiwai@xxxxxxx> [1].

Link: https://patch.msgid.link/20250919163147.4743-3-tiwai@xxxxxxx [1]
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---

v3 -> v4:
* Use ACQUIRE()/ACQUIRE_ERR() (Jonathan)
* Adjust subject and changelog
* Take patch ownership (it's all different now)
* Pick up Bjorn's ACK from v3 (Bjorn, please let me know if that's not OK)

v2 -> v3: No changes

v1 -> v2:
* Adjust the name of the class to handle the disabled runtime PM case
transparently (like the original code).

---
drivers/pci/pci-sysfs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1475,8 +1475,9 @@ static ssize_t reset_method_store(struct
return count;
}

- pm_runtime_get_sync(dev);
- struct device *pmdev __free(pm_runtime_put) = dev;
+ ACQUIRE(pm_runtime_active_try, pm)(dev);
+ if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+ return -ENXIO;

if (sysfs_streq(buf, "default")) {
pci_init_reset_methods(pdev);