Commit-ID:  f075915ac0b11847fcfc8c4d55526a317e71c4d1
Gitweb:     http://git.kernel.org/tip/f075915ac0b11847fcfc8c4d55526a317e71c4d1
Author:     Marc Zyngier <[email protected]>
AuthorDate: Tue, 28 Jul 2015 14:46:26 +0100
Committer:  Thomas Gleixner <[email protected]>
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 <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Cc: <[email protected]>
Cc: Yijing Wang <[email protected]>
Cc: Ma Jun <[email protected]>
Cc: Lorenzo Pieralisi <[email protected]>
Cc: Duc Dang <[email protected]>
Cc: Hanjun Guo <[email protected]>
Cc: Jiang Liu <[email protected]>
Cc: Jason Cooper <[email protected]>
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
 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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to