PCI: xgene: Use managed clock for PCIe controller
PATCH 1/1 PCI: xgene: Use managed clock for PCIe controller
xgene_pcie_init_port() obtains and enables the controller clock manually. When xgene_pcie_setup() or pci_host_probe() fails, probe returns without disabling, unpreparing, or releasing the clock. A failed enable also leaves the clk_get() reference unreleased.
Use devm_clk_get_enabled() so the clock is unwound automatically on probe failure and device removal.
--- drivers/pci/controller/pci-xgene.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-xgene.c +2 -9
@@ -321,18 +321,11 @@ static void xgene_pcie_linkup(struct xgene_pcie *port,static int xgene_pcie_init_port (struct xgene_pcie *port) {struct device *dev = port->dev; -int rc; - port->clk =clk_get (dev,NULL ); + port->clk =devm_clk_get_enabled (dev,NULL );if (IS_ERR (port->clk)) {dev_err (dev,"clock not available\n" ); -return -ENODEV ; - } - - rc =clk_prepare_enable (port->clk); -if (rc) { -dev_err (dev,"clock enable failed\n" ); -return rc; +return PTR_ERR (port->clk); }return 0 ;
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] Spurious error messages logged when `devm_clk_get_enabled()` returns `-EPROBE_DEFER`. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Spurious error messages logged when devm_clk_get_enabled() returns -EPROBE_DEFER. --
--- Patch [1]: [PATCH v1] PCI: xgene: Use managed clock for PCIe controller --- commit 0cead2017a15cf2ef3dd587c853cc1410cad1d70
Author: Yuho Choi <[email protected]>
PCI: xgene: Use managed clock for PCIe controller
This commit simplifies the xgene PCIe port initialization by replacing manual clock retrieval and enablement with devm_clk_get_enabled(). This automatically handles unwinding the clock on probe failure and device removal.
Quoted 11 lines
drivers/pci/controller/pci-xgene.c +1
-2@@ -321,18 +321,11 @@ static void xgene_pcie_linkup(struct xgene_pcie *port,static int xgene_pcie_init_port (struct xgene_pcie *port) {struct device *dev = port->dev; -int rc; - port->clk =clk_get (dev,NULL ); + port->clk =devm_clk_get_enabled (dev,NULL );
drivers/pci/controller/pci-xgene.c static void xgene_pcie_linkup(struct xgene_pcie *port, · line 328
Quoted 10 lines
drivers/pci/controller/pci-xgene.c +1
-7if (IS_ERR (port->clk)) {dev_err (dev,"clock not available\n" ); -return -ENODEV ; - } - - rc =clk_prepare_enable (port->clk); -if (rc) { -dev_err (dev,"clock enable failed\n" ); -return rc; +return PTR_ERR (port->clk);
[Severity: Medium]
Does this unconditional dev_err() cause log spam during boot if devm_clk_get_enabled() returns -EPROBE_DEFER?
Could dev_err_probe() be used here instead?
Quoted 3 lines
drivers/pci/controller/pci-xgene.c +0
-0}return 0 ;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Manivannan Sadhasivam
AppliedQuoted 9 lines · Yuho Choi
xgene_pcie_init_port()obtains and enables the controller clock manually. Whenxgene_pcie_setup()orpci_host_probe()fails, probe returns without disabling, unpreparing, or releasing the clock. A failed enable also leaves theclk_get()reference unreleased.Use
devm_clk_get_enabled()so the clock is unwound automatically on probe failure and device removal.[...]
Applied, thanks!
[1/1] PCI: xgene: Use managed clock for PCIe controller
commit: b9022584ebbae81f7bbe4a61bd1df0d0a95e1a99
Best regards,
Signature · 1 line
மணிவண்ணன் சதாசிவம்