[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-f075915ac0b11847fcfc8c4d55526a317e71c4d1@git.kernel.org>
Date: Wed, 29 Jul 2015 15:31:09 -0700
From: tip-bot for Marc Zyngier <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, lorenzo.pieralisi@....com,
jason@...edaemon.net, dhdang@....com, majun258@...wei.com,
hanjun.guo@...aro.org, hpa@...or.com, marc.zyngier@....com,
wangyijing@...wei.com, mingo@...nel.org, tglx@...utronix.de,
jiang.liu@...ux.intel.com, linux-arm-kernel@...ts.infradead.org,
bhelgaas@...gle.com
Subject: [tip:irq/core] PCI/MSI: Drop domain field from msi_controller
Commit-ID: f075915ac0b11847fcfc8c4d55526a317e71c4d1
Gitweb: http://git.kernel.org/tip/f075915ac0b11847fcfc8c4d55526a317e71c4d1
Author: Marc Zyngier <marc.zyngier@....com>
AuthorDate: Tue, 28 Jul 2015 14:46:26 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 30 Jul 2015 00:14:39 +0200
PCI/MSI: Drop domain field from msi_controller
The only three users of that field are not using the msi_controller
structure anymore, so drop it altogether.
Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
Signed-off-by: Marc Zyngier <marc.zyngier@....com>
Cc: <linux-arm-kernel@...ts.infradead.org>
Cc: Yijing Wang <wangyijing@...wei.com>
Cc: Ma Jun <majun258@...wei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc: Duc Dang <dhdang@....com>
Cc: Hanjun Guo <hanjun.guo@...aro.org>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Jason Cooper <jason@...edaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-20-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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 4603344..f70aa0f 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 809b749..ad939d0 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -160,9 +160,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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists