linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Jiang Liu <jiang.liu@linux.intel.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
	<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Yijing Wang <wangyijing@huawei.com>,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH v2 8/8] PCI/MSI: Drop domain field from msi_controller
Date: Thu,  8 Jan 2015 17:06:12 +0000	[thread overview]
Message-ID: <1420736772-11088-9-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1420736772-11088-1-git-send-email-marc.zyngier@arm.com>

The only two users of that field are not using the msi_controller
structure anymore, so drop it altogether.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/pci/msi.c   | 2 --
 include/linux/msi.h | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 003040b..a36894f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -42,8 +42,6 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
 	struct irq_domain *domain = NULL;
 
 	domain = dev_get_msi_domain(&dev->dev);
-	if (!domain && dev->bus->msi)
-		domain = dev->bus->msi->domain;
 	if (!domain)
 		domain = arch_get_pci_msi_domain(dev);
 
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 8ac4a68..692f217 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -108,9 +108,6 @@ struct msi_controller {
 	struct device *dev;
 	struct device_node *of_node;
 	struct list_head list;
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-	struct irq_domain *domain;
-#endif
 
 	int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev,
 			 struct msi_desc *desc);
-- 
2.1.4


  parent reply	other threads:[~2015-01-08 17:06 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-08 17:06 [PATCH v2 0/8] Introducing per-device MSI domain Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 1/8] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-01-15 20:35   ` Stuart Yoder
2015-01-16 19:10     ` Marc Zyngier
2015-01-19  2:10     ` Jiang Liu
2015-01-20 17:17       ` Stuart Yoder
2015-01-21  1:34         ` Jiang Liu
2015-01-08 17:06 ` [PATCH v2 2/8] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier
2015-01-13 12:34   ` Yijing Wang
2015-01-13 13:45     ` Marc Zyngier
2015-01-14  2:04       ` Yijing Wang
2015-01-14  2:06   ` Yijing Wang
2015-01-08 17:06 ` [PATCH v2 3/8] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-01-14  8:17   ` Yun Wu (Abel)
2015-01-14 10:19     ` Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 4/8] PCI/MSI: of: Allow msi_domain lookup using the PHB node Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 5/8] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 6/8] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-01-08 17:06 ` [PATCH v2 7/8] irqchip: gicv3-its: " Marc Zyngier
2015-01-08 17:06 ` Marc Zyngier [this message]
2015-01-27  0:45 ` [PATCH v2 0/8] Introducing per-device MSI domain Bjorn Helgaas

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=1420736772-11088-9-git-send-email-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=Suravee.Suthikulpanit@amd.com \
    --cc=bhelgaas@google.com \
    --cc=jiang.liu@linux.intel.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangyijing@huawei.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).