Commit-ID:  e1d8f79a27a41493c8f1ad0bde440048e17f9494
Gitweb:     http://git.kernel.org/tip/e1d8f79a27a41493c8f1ad0bde440048e17f9494
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 27 Oct 2014 16:12:10 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 5 Nov 2014 18:10:48 +0100

iommu/amd: Use helpers to access irq_cfg data structure associated with IRQ

Use helpers to access irq_cfg data structure associated with IRQ,
instead of accessing irq_data->chip_data directly. Later we can
rewrite those helpers to support hierarchy irqdomain.

Signed-off-by: Jiang Liu <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Randy Dunlap <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Joerg Roedel <[email protected]>
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
 drivers/iommu/amd_iommu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 505a9ad..6fda7cc 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4068,7 +4068,7 @@ static int setup_ioapic_entry(int irq, struct 
IO_APIC_route_entry *entry,
        int devid;
        int ret;
 
-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);
        if (!cfg)
                return -EINVAL;
 
@@ -4131,7 +4131,7 @@ static int set_affinity(struct irq_data *data, const 
struct cpumask *mask,
        if (!config_enabled(CONFIG_SMP))
                return -1;
 
-       cfg       = data->chip_data;
+       cfg       = irqd_cfg(data);
        irq       = data->irq;
        irte_info = &cfg->irq_2_irte;
 
@@ -4169,7 +4169,7 @@ static int free_irq(int irq)
        struct irq_2_irte *irte_info;
        struct irq_cfg *cfg;
 
-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);
        if (!cfg)
                return -EINVAL;
 
@@ -4188,7 +4188,7 @@ static void compose_msi_msg(struct pci_dev *pdev,
        struct irq_cfg *cfg;
        union irte irte;
 
-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);
        if (!cfg)
                return;
 
@@ -4217,7 +4217,7 @@ static int msi_alloc_irq(struct pci_dev *pdev, int irq, 
int nvec)
        if (!pdev)
                return -EINVAL;
 
-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);
        if (!cfg)
                return -EINVAL;
 
@@ -4237,7 +4237,7 @@ static int msi_setup_irq(struct pci_dev *pdev, unsigned 
int irq,
        if (!pdev)
                return -EINVAL;
 
-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);
        if (!cfg)
                return -EINVAL;
 
@@ -4260,7 +4260,7 @@ static int alloc_hpet_msi(unsigned int irq, unsigned int 
id)
        struct irq_cfg *cfg;
        int index, devid;
 
-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);
        if (!cfg)
                return -EINVAL;
 
--
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