1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 2c3f5ad01098..89c4846683be 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -298,7 +298,7 @@ static int set_remapped_irq_affinity(struct irq_data *data,
 
 void free_remapped_irq(int irq)
 {
-        struct irq_cfg *cfg = irq_get_chip_data(irq);
+        struct irq_cfg *cfg = irq_cfg(irq);
 
         if (!remap_ops || !remap_ops->free_irq)
                 return;
@@ -311,7 +311,7 @@ void compose_remapped_msi_msg(struct pci_dev *pdev,
                               unsigned int irq, unsigned int dest,
                               struct msi_msg *msg, u8 hpet_id)
 {
-        struct irq_cfg *cfg = irq_get_chip_data(irq);
+        struct irq_cfg *cfg = irq_cfg(irq);
 
         if (!irq_remapped(cfg))
                 native_compose_msi_msg(pdev, irq, dest, msg, hpet_id);
@@ -364,7 +364,7 @@ static void ir_ack_apic_edge(struct irq_data *data)
 static void ir_ack_apic_level(struct irq_data *data)
 {
         ack_APIC_irq();
-        eoi_ioapic_irq(data->irq, data->chip_data);
+        eoi_ioapic_irq(data->irq, irqd_cfg(data));
 }
 
 static void ir_print_prefix(struct irq_data *data, struct seq_file *p)