dmar: Convert to new irq chip functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Acked-by: David Woodhouse <dwmw2@infradead.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index dbb43424704c..00b19a416eab 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -160,8 +160,8 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
 
 static struct irq_chip dmar_msi_type = {
         .name = "DMAR_MSI",
-        .unmask = dmar_msi_unmask,
-        .mask = dmar_msi_mask,
+        .irq_unmask = dmar_msi_unmask,
+        .irq_mask = dmar_msi_mask,
         .ack = ia64_ack_msi_irq,
 #ifdef CONFIG_SMP
         .set_affinity = dmar_msi_set_affinity,
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 49aa857ff004..72b253ef310e 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3578,8 +3578,8 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
 
 static struct irq_chip dmar_msi_type = {
         .name = "DMAR_MSI",
-        .unmask = dmar_msi_unmask,
-        .mask = dmar_msi_mask,
+        .irq_unmask = dmar_msi_unmask,
+        .irq_mask = dmar_msi_mask,
         .irq_ack = ack_apic_edge,
 #ifdef CONFIG_SMP
         .set_affinity = dmar_msi_set_affinity,