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>,
Ryder Lee <ryder.lee@mediatek.com>
Subject: [PATCH 7/9] PCI: mediatek: Use pci_alloc_intx_irqd() helper to get irq domain for INTx
Date: Fri, 27 Apr 2018 16:24:28 +0800 [thread overview]
Message-ID: <1524817468-242615-1-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1524817322-239028-1-git-send-email-shawn.lin@rock-chips.com>
Just avoid code duplication, but no functional change intended.
Cc: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/pci/host/pcie-mediatek.c | 29 +++--------------------------
1 file changed, 3 insertions(+), 26 deletions(-)
diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
index a8b20c5..e977a43 100644
--- a/drivers/pci/host/pcie-mediatek.c
+++ b/drivers/pci/host/pcie-mediatek.c
@@ -541,38 +541,15 @@ static void mtk_pcie_enable_msi(struct mtk_pcie_port *port)
writel(val, port->base + PCIE_INT_MASK);
}
-static int mtk_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 = mtk_pcie_intx_map,
-};
-
static int mtk_pcie_init_irq_domain(struct mtk_pcie_port *port,
struct device_node *node)
{
struct device *dev = port->pcie->dev;
- struct device_node *pcie_intc_node;
- /* Setup INTx */
- pcie_intc_node = of_get_next_child(node, NULL);
- if (!pcie_intc_node) {
- dev_err(dev, "no PCIe Intc node found\n");
- return -ENODEV;
- }
+ port->irq_domain = pci_alloc_intx_irqd(dev, port, false, NULL, NULL);
+ if (IS_ERR(port->irq_domain))
+ return PTR_ERR(port->irq_domain);
- port->irq_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,
- &intx_domain_ops, port);
- if (!port->irq_domain) {
- dev_err(dev, "failed to get INTx IRQ domain\n");
- return -ENODEV;
- }
if (IS_ENABLED(CONFIG_PCI_MSI)) {
port->msi_domain = irq_domain_add_linear(node, MTK_MSI_IRQS_NUM,
--
1.9.1
next prev parent reply other threads:[~2018-04-27 8:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-27 8:22 [PATCH 0/9] Add new helper to allocate irq domain for hosts Shawn Lin
2018-04-27 8:22 ` [PATCH 1/9] PCI: Add new helper for allocating irq domain for INTx Shawn Lin
2018-04-27 17:18 ` Bjorn Helgaas
2018-04-28 0:44 ` Shawn Lin
2018-04-28 22:52 ` kbuild test robot
2018-04-28 23:08 ` kbuild test robot
2018-04-27 8:22 ` [PATCH 2/9] PCI: dra7xx: Use pci_alloc_intx_irqd() helper to simplify the code Shawn Lin
2018-04-27 8:23 ` [PATCH 3/9] PCI: keystone-dw: Use pci_alloc_intx_irqd() helper to get irq domain for INTx Shawn Lin
2018-04-27 8:23 ` [PATCH 4/9] PCI: aardvark: " Shawn Lin
2018-04-27 8:23 ` [PATCH 5/9] PCI: faraday: " Shawn Lin
2018-04-28 23:32 ` kbuild test robot
2018-04-27 8:24 ` [PATCH 6/9] PCI: altera: " Shawn Lin
2018-04-27 8:24 ` Shawn Lin [this message]
2018-04-27 8:24 ` [PATCH 8/9] PCI: xilinx-nwl: " Shawn Lin
2018-04-27 8:25 ` [PATCH 9/9] PCI: xilinx: " Shawn Lin
2018-04-30 10:19 ` [PATCH 0/9] Add new helper to allocate irq domain for hosts Lorenzo Pieralisi
2018-05-02 0:59 ` 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=1524817468-242615-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=ryder.lee@mediatek.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).