Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / iommu / amd_iommu.c

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b205f76..9802485 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4071,7 +4071,7 @@ static int setup_ioapic_entry(int irq, struct IO_APIC_route_entry *entry,
        int devid;
        int ret;
 
        int devid;
        int ret;
 

-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);

        if (!cfg)
                return -EINVAL;
 
        if (!cfg)
                return -EINVAL;
 


@@ -4134,7 +4134,7 @@ static int set_affinity(struct irq_data *data, const struct cpumask *mask,
        if (!config_enabled(CONFIG_SMP))
                return -1;
 
        if (!config_enabled(CONFIG_SMP))
                return -1;
 

-       cfg       = data->chip_data;
+       cfg       = irqd_cfg(data);

        irq       = data->irq;
        irte_info = &cfg->irq_2_irte;
 
        irq       = data->irq;
        irte_info = &cfg->irq_2_irte;
 


@@ -4172,7 +4172,7 @@ static int free_irq(int irq)
        struct irq_2_irte *irte_info;
        struct irq_cfg *cfg;
 
        struct irq_2_irte *irte_info;
        struct irq_cfg *cfg;
 

-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);

        if (!cfg)
                return -EINVAL;
 
        if (!cfg)
                return -EINVAL;
 


@@ -4191,7 +4191,7 @@ static void compose_msi_msg(struct pci_dev *pdev,
        struct irq_cfg *cfg;
        union irte irte;
 
        struct irq_cfg *cfg;
        union irte irte;
 

-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);

        if (!cfg)
                return;
 
        if (!cfg)
                return;
 


@@ -4220,7 +4220,7 @@ static int msi_alloc_irq(struct pci_dev *pdev, int irq, int nvec)
        if (!pdev)
                return -EINVAL;
 
        if (!pdev)
                return -EINVAL;
 

-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);

        if (!cfg)
                return -EINVAL;
 
        if (!cfg)
                return -EINVAL;
 


@@ -4240,7 +4240,7 @@ static int msi_setup_irq(struct pci_dev *pdev, unsigned int irq,
        if (!pdev)
                return -EINVAL;
 
        if (!pdev)
                return -EINVAL;
 

-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);

        if (!cfg)
                return -EINVAL;
 
        if (!cfg)
                return -EINVAL;
 


@@ -4263,7 +4263,7 @@ static int alloc_hpet_msi(unsigned int irq, unsigned int id)
        struct irq_cfg *cfg;
        int index, devid;
 
        struct irq_cfg *cfg;
        int index, devid;
 

-       cfg = irq_get_chip_data(irq);
+       cfg = irq_cfg(irq);

        if (!cfg)
                return -EINVAL;
 
        if (!cfg)
                return -EINVAL;