From: Shawn Lin <shawn.lin@rock-chips.com>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, Shawn Lin <shawn.lin@rock-chips.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: [PATCH v2 4/9] PCI: aardvark: Use pci_alloc_intx_irqd() helper to get irq domain for INTx
Date: Sat, 28 Apr 2018 09:49:29 +0800 [thread overview]
Message-ID: <1524880169-101045-1-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1524880102-100856-1-git-send-email-shawn.lin@rock-chips.com>
Just avoid code duplication, but no functional change intended.
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Changes in v2: None
drivers/pci/host/pci-aardvark.c | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
index 9abf549..df02b9a 100644
--- a/drivers/pci/host/pci-aardvark.c
+++ b/drivers/pci/host/pci-aardvark.c
@@ -702,37 +702,23 @@ static void advk_pcie_remove_msi_irq_domain(struct advk_pcie *pcie)
static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
{
struct device *dev = &pcie->pdev->dev;
- struct device_node *node = dev->of_node;
- struct device_node *pcie_intc_node;
struct irq_chip *irq_chip;
- pcie_intc_node = of_get_next_child(node, NULL);
- if (!pcie_intc_node) {
- dev_err(dev, "No PCIe Intc node found\n");
- return -ENODEV;
- }
-
irq_chip = &pcie->irq_chip;
irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-irq",
dev_name(dev));
- if (!irq_chip->name) {
- of_node_put(pcie_intc_node);
+ if (!irq_chip->name)
return -ENOMEM;
- }
irq_chip->irq_mask = advk_pcie_irq_mask;
irq_chip->irq_mask_ack = advk_pcie_irq_mask;
irq_chip->irq_unmask = advk_pcie_irq_unmask;
- pcie->irq_domain =
- irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,
- &advk_pcie_irq_domain_ops, pcie);
- if (!pcie->irq_domain) {
- dev_err(dev, "Failed to get a INTx IRQ domain\n");
- of_node_put(pcie_intc_node);
- return -ENOMEM;
- }
+ pcie->irq_domain = pci_alloc_intx_irqd(dev, pcie, false,
+ &advk_pcie_irq_domain_ops, NULL);
+ if (IS_ERR(pcie->irq_domain))
+ return PTR_ERR(pcie->irq_domain);
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2018-04-28 1:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-28 1:48 [PATCH v2 0/9] Add new helper to allocate IRQ domain for host drivers Shawn Lin
2018-04-28 1:48 ` [PATCH v2 1/9] PCI: Add pci_alloc_intx_irqd() for allocating IRQ domain Shawn Lin
2018-04-28 17:59 ` Christoph Hellwig
2018-04-29 21:56 ` kbuild test robot
2018-04-30 0:23 ` kbuild test robot
2018-04-28 1:49 ` [PATCH v2 2/9] PCI: dra7xx: Use pci_alloc_intx_irqd() helper to simplify the code Shawn Lin
2018-04-28 1:49 ` [PATCH v2 3/9] PCI: keystone-dw: Use pci_alloc_intx_irqd() helper to get irq domain for INTx Shawn Lin
2018-04-28 1:49 ` Shawn Lin [this message]
2018-04-28 1:49 ` [PATCH v2 5/9] PCI: faraday: " Shawn Lin
2018-04-28 1:50 ` [PATCH v2 6/9] PCI: altera: " Shawn Lin
2018-04-28 1:50 ` [PATCH v2 7/9] PCI: mediatek: " Shawn Lin
2018-04-28 1:50 ` [PATCH v2 8/9] PCI: xilinx-nwl: " Shawn Lin
2018-04-28 1:50 ` [PATCH v2 9/9] PCI: xilinx: " Shawn Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1524880169-101045-1-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).