Commit a103d2de authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Bjorn Helgaas
Browse files

PCI: controller: Use dev_fwnode() instead of of_fwnode_handle() 



All irq_domain functions now accept fwnode instead of of_node. But many
PCI controllers still extract dev to of_node and then of_node to fwnode.

Instead, clean this up and simply use the dev_fwnode() helper to extract
fwnode directly from dev. Internally, it still does dev => of_node =>
fwnode steps, but it's now hidden from the users.

In the case of altera, this also removes an unused 'node' variable that is
only used when CONFIG_OF is enabled:

  drivers/pci/controller/pcie-altera.c: In function 'altera_pcie_init_irq_domain':
  drivers/pci/controller/pcie-altera.c:855:29: error: unused variable 'node' [-Werror=unused-variable]
    855 |         struct device_node *node = dev->of_node;

Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>	# altera
[bhelgaas: squash together, rebase to precede msi-parent]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250521163329.2137973-1-arnd@kernel.org
Link: https://patch.msgid.link/20250611104348.192092-16-jirislaby@kernel.org
Link: https://patch.msgid.link/20250723065907.1841758-1-jirislaby@kernel.org
parent 19272b37

drivers/pci/controller/dwc/pcie-designware-host.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = { 
int dw_pcie_allocate_domains(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct fwnode_handle *fwnode = of_fwnode_handle(pci->dev->of_node);

	struct fwnode_handle *fwnode = dev_fwnode(pci->dev);



	pp->irq_domain = irq_domain_create_linear(fwnode, pp->num_vectors,

					       &dw_pcie_msi_domain_ops, pp);

drivers/pci/controller/mobiveil/pcie-mobiveil-host.c

+3 −4
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = { 
static int mobiveil_allocate_msi_domains(struct mobiveil_pcie *pcie)

{

	struct device *dev = &pcie->pdev->dev;

	struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node);

	struct fwnode_handle *fwnode = dev_fwnode(dev);

	struct mobiveil_msi *msi = &pcie->rp.msi;



	mutex_init(&msi->lock);
@@ -464,9 +464,8 @@ static int mobiveil_pcie_init_irq_domain(struct mobiveil_pcie *pcie) 
	struct mobiveil_root_port *rp = &pcie->rp;



	/* setup INTx */

	rp->intx_domain = irq_domain_create_linear(of_fwnode_handle(dev->of_node), PCI_NUM_INTX,

						   &intx_domain_ops, pcie);



	rp->intx_domain = irq_domain_create_linear(dev_fwnode(dev), PCI_NUM_INTX, &intx_domain_ops,

						   pcie);

	if (!rp->intx_domain) {

		dev_err(dev, "Failed to get a INTx IRQ domain\n");

		return -ENOMEM;

drivers/pci/controller/pcie-altera-msi.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = { 


static int altera_allocate_domains(struct altera_msi *msi)

{

	struct fwnode_handle *fwnode = of_fwnode_handle(msi->pdev->dev.of_node);

	struct fwnode_handle *fwnode = dev_fwnode(&msi->pdev->dev);



	msi->inner_domain = irq_domain_create_linear(NULL, msi->num_of_vectors,

					     &msi_domain_ops, msi);

drivers/pci/controller/pcie-altera.c

+1 −2
Original line number Diff line number Diff line
@@ -852,10 +852,9 @@ static void aglx_isr(struct irq_desc *desc) 
static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)

{

	struct device *dev = &pcie->pdev->dev;

	struct device_node *node = dev->of_node;



	/* Setup INTx */

	pcie->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), PCI_NUM_INTX,

	pcie->irq_domain = irq_domain_create_linear(dev_fwnode(dev), PCI_NUM_INTX,

					&intx_domain_ops, pcie);

	if (!pcie->irq_domain) {

		dev_err(dev, "Failed to get a INTx IRQ domain\n");

drivers/pci/controller/pcie-mediatek-gen3.c

+1 −2
Original line number Diff line number Diff line
@@ -756,8 +756,7 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie) 
	/* Setup MSI */

	mutex_init(&pcie->lock);



	pcie->msi_bottom_domain = irq_domain_create_linear(of_fwnode_handle(node),

							   PCIE_MSI_IRQS_NUM,

	pcie->msi_bottom_domain = irq_domain_create_linear(dev_fwnode(dev), PCIE_MSI_IRQS_NUM,

							   &mtk_msi_bottom_domain_ops, pcie);

	if (!pcie->msi_bottom_domain) {

		dev_err(dev, "failed to create MSI bottom domain\n");