1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 2d84c9edf3b8..d65f76643664 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -4069,7 +4069,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;
 
@@ -4132,7 +4132,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;
 
@@ -4170,7 +4170,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;
 
@@ -4189,7 +4189,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;
 
@@ -4218,7 +4218,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;
 
@@ -4238,7 +4238,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;
 
@@ -4261,7 +4261,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;