[PATCH] PCI: dwc: uniphier: use fwnode API for legacy-interrupt-controller
From: Rosen Penev <hidden>
Date: 2026-07-15 01:12:27
Also in:
linux-pci, lkml, llvm
Subsystem:
pci native host bridge and endpoint drivers, pci subsystem, pcie driver for socionext uniphier, the rest · Maintainers:
Lorenzo Pieralisi, Krzysztof Wilczyński, Manivannan Sadhasivam, Bjorn Helgaas, Kunihiko Hayashi, Linus Torvalds
Convert uniphier_pcie_config_intx_irq() from the OF-specific to the generic firmware-node API: of_get_child_by_name() to device_get_named_child_node(), irq_of_parse_and_map() to fwnode_irq_get(), of_fwnode_handle() on the child node to passing the fwnode directly, and of_node_put() to fwnode_handle_put(). Unlike irq_of_parse_and_map(), fwnode_irq_get() returns a positive IRQ or a negative errno and never 0 (it rewrites 0 to -EINVAL), so check pp->irq < 0 and propagate the error. pp->irq is an int, so the negative value is preserved. Drop the now-unused np / dev_fwnode() locals, since device_get_named_child_node() operates on the device directly. Built for arm64 (defconfig + CONFIG_PCIE_UNIPHIER) with LLVM=1; drivers/pci/controller/dwc/pcie-uniphier.o compiles cleanly. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev <redacted> --- drivers/pci/controller/dwc/pcie-uniphier.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c
index 297e7a3d9b36..6516264fdfc1 100644
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c@@ -262,27 +262,27 @@ static int uniphier_pcie_config_intx_irq(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct uniphier_pcie *pcie = to_uniphier_pcie(pci); - struct device_node *np = pci->dev->of_node; - struct device_node *np_intc; + struct device *dev = pci->dev; + struct fwnode_handle *fw_intc; int ret = 0; - np_intc = of_get_child_by_name(np, "legacy-interrupt-controller"); - if (!np_intc) { - dev_err(pci->dev, "Failed to get legacy-interrupt-controller node\n"); + fw_intc = device_get_named_child_node(dev, "legacy-interrupt-controller"); + if (!fw_intc) { + dev_err(dev, "Failed to get legacy-interrupt-controller node\n"); return -EINVAL; } - pp->irq = irq_of_parse_and_map(np_intc, 0); - if (!pp->irq) { - dev_err(pci->dev, "Failed to get an IRQ entry in legacy-interrupt-controller\n"); + pp->irq = fwnode_irq_get(fw_intc, 0); + if (pp->irq < 0) { + dev_err(dev, "Failed to get an IRQ entry in legacy-interrupt-controller\n"); ret = -EINVAL; goto out_put_node; } - pcie->intx_irq_domain = irq_domain_create_linear(of_fwnode_handle(np_intc), PCI_NUM_INTX, + pcie->intx_irq_domain = irq_domain_create_linear(fw_intc, PCI_NUM_INTX, &uniphier_intx_domain_ops, pp); if (!pcie->intx_irq_domain) { - dev_err(pci->dev, "Failed to get INTx domain\n"); + dev_err(dev, "Failed to get INTx domain\n"); ret = -ENODEV; goto out_put_node; }
@@ -291,7 +291,7 @@ static int uniphier_pcie_config_intx_irq(struct dw_pcie_rp *pp) pp); out_put_node: - of_node_put(np_intc); + fwnode_handle_put(fw_intc); return ret; }
--
2.55.0