linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 19/19] PCI/MSI: Drop domain field from msi_controller
Date: Tue, 28 Jul 2015 14:46:26 +0100	[thread overview]
Message-ID: <1438091186-10244-20-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1438091186-10244-1-git-send-email-marc.zyngier@arm.com>

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

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

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 70afadc..e7038f1 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -45,9 +45,6 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
 	if (domain)
 		return domain;
 
-	if (dev->bus->msi && (domain = dev->bus->msi->domain))
-		return domain;
-
 	return arch_get_pci_msi_domain(dev);
 }
 
diff --git a/include/linux/msi.h b/include/linux/msi.h
index c4e6e83..bf39b9c 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -124,9 +124,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-07-28 13:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-28 13:46 [PATCH v6 00/19] Per-device MSI domain & platform MSI Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 01/19] genirq: irqdomain: Allow irq domain aliasing Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 02/19] PCI: MSI: Register irq domain with specific token Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 03/19] device core: Introduce per-device MSI domain pointer Marc Zyngier
2015-07-29 22:25   ` [tip:irq/core] " tip-bot for Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 04/19] PCI/MSI: Add hooks to populate the msi_domain field Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 05/19] PCI/MSI: of: Add support for OF-provided msi_domain Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 06/19] PCI/MSI: of: Allow msi_domain lookup using the host bridge node Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 07/19] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 08/19] platform: of: Assign MSI domain to platform device Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 09/19] drivers: base: Add MSI domain support for non-PCI devices Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 10/19] genirq: Add DOMAIN_BUS_NEXUS irqdomain property Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 11/19] irqchip: gicv3-its: Split PCI/MSI code from the core ITS driver Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 12/19] irqchip: gicv3-its: Register irq domain with NEXUS token Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 13/19] irqchip: gicv3-its: Get rid of struct msi_controller Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 14/19] irqchip: gicv3-its: Make the PCI/MSI code standalone Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 15/19] irqchip: gicv3-its: Add platform MSI support Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 16/19] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 17/19] irqchip: GICv2m: Add platform MSI support Marc Zyngier
2015-07-28 13:46 ` [PATCH v6 18/19] PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller Marc Zyngier
2015-07-28 13:46 ` Marc Zyngier [this message]

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=1438091186-10244-20-git-send-email-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).