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>,
Ley Foon Tan <ley.foon.tan@intel.com>
Subject: [PATCH v2 6/9] PCI: altera: Use pci_alloc_intx_irqd() helper to get irq domain for INTx
Date: Sat, 28 Apr 2018 09:50:03 +0800 [thread overview]
Message-ID: <1524880203-101149-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: Ley Foon Tan <ley.foon.tan@intel.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Changes in v2: None
drivers/pci/host/pcie-altera.c | 38 ++++----------------------------------
1 file changed, 4 insertions(+), 34 deletions(-)
diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c
index a6af62e..a0fcf0f 100644
--- a/drivers/pci/host/pcie-altera.c
+++ b/drivers/pci/host/pcie-altera.c
@@ -441,19 +441,6 @@ static void altera_pcie_retrain(struct altera_pcie *pcie)
}
}
-static int altera_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
- irq_hw_number_t hwirq)
-{
- irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq);
- irq_set_chip_data(irq, domain->host_data);
- return 0;
-}
-
-static const struct irq_domain_ops intx_domain_ops = {
- .map = altera_pcie_intx_map,
- .xlate = pci_irqd_intx_xlate,
-};
-
static void altera_pcie_isr(struct irq_desc *desc)
{
struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -518,22 +505,6 @@ static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
return err;
}
-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_add_linear(node, PCI_NUM_INTX,
- &intx_domain_ops, pcie);
- if (!pcie->irq_domain) {
- dev_err(dev, "Failed to get a INTx IRQ domain\n");
- return -ENOMEM;
- }
-
- return 0;
-}
-
static int altera_pcie_parse_dt(struct altera_pcie *pcie)
{
struct device *dev = &pcie->pdev->dev;
@@ -591,11 +562,10 @@ static int altera_pcie_probe(struct platform_device *pdev)
return ret;
}
- ret = altera_pcie_init_irq_domain(pcie);
- if (ret) {
- dev_err(dev, "Failed creating IRQ Domain\n");
- return ret;
- }
+ pcie->irq_domain = pci_alloc_intx_irqd(dev, pcie, true, NULL,
+ dev->of_node);
+ if (IS_ERR(pcie->irq_domain))
+ return PTR_ERR(pcie->irq_domain);
/* clear all interrupts */
cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS);
--
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 ` [PATCH v2 4/9] PCI: aardvark: " Shawn Lin
2018-04-28 1:49 ` [PATCH v2 5/9] PCI: faraday: " Shawn Lin
2018-04-28 1:50 ` Shawn Lin [this message]
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=1524880203-101149-1-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=bhelgaas@google.com \
--cc=ley.foon.tan@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.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).