diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2025-07-31 16:12:15 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2025-07-31 16:12:15 -0500 |
| commit | d5b0b60ab054ef8006a6339ba8f6eeda3ba8a120 (patch) | |
| tree | bd12c382a80e8c687b2eace467de089f9ed55ed1 | |
| parent | Merge branch 'pci/controller/imx6' (diff) | |
| parent | PCI: mvebu: Use devm_add_action_or_reset() instead of devm_add_action() (diff) | |
| download | linux-d5b0b60ab054ef8006a6339ba8f6eeda3ba8a120.tar.gz linux-d5b0b60ab054ef8006a6339ba8f6eeda3ba8a120.zip | |
Merge branch 'pci/controller/mvebu'
- Use devm_add_action_or_reset() when adding port->clk devm cleanup action
so we don't have to explicitly call clk_put() (Salah Triki)
* pci/controller/mvebu:
PCI: mvebu: Use devm_add_action_or_reset() instead of devm_add_action()
| -rw-r--r-- | drivers/pci/controller/pci-mvebu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index a4a2bac4f4b2..755651f33811 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -1353,11 +1353,9 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, goto skip; } - ret = devm_add_action(dev, mvebu_pcie_port_clk_put, port); - if (ret < 0) { - clk_put(port->clk); + ret = devm_add_action_or_reset(dev, mvebu_pcie_port_clk_put, port); + if (ret < 0) goto err; - } return 1; |