iommu: rename intr_remapping references to irq_remapping

Make the code consistent with the naming conventions of irq subsystem.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 647e366403dc..ee74f698eef8 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -556,7 +556,7 @@ int __init detect_intel_iommu(void)
 
                 dmar = (struct acpi_table_dmar *) dmar_tbl;
 
-                if (ret && intr_remapping_enabled && cpu_has_x2apic &&
+                if (ret && irq_remapping_enabled && cpu_has_x2apic &&
                     dmar->flags & 0x1)
                         printk(KERN_INFO
                                "Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
@@ -1042,7 +1042,7 @@ static const char *dma_remap_fault_reasons[] =
         "non-zero reserved fields in PTE",
 };
 
-static const char *intr_remap_fault_reasons[] =
+static const char *irq_remap_fault_reasons[] =
 {
         "Detected reserved fields in the decoded interrupt-remapped request",
         "Interrupt index exceeded the interrupt-remapping table size",
@@ -1058,9 +1058,9 @@ static const char *intr_remap_fault_reasons[] =
 const char *dmar_get_fault_reason(u8 fault_reason, int *fault_type)
 {
         if (fault_reason >= 0x20 && (fault_reason <= 0x20 +
-                                     ARRAY_SIZE(intr_remap_fault_reasons))) {
+                                     ARRAY_SIZE(irq_remap_fault_reasons))) {
                 *fault_type = INTR_REMAP;
-                return intr_remap_fault_reasons[fault_reason - 0x20];
+                return irq_remap_fault_reasons[fault_reason - 0x20];
         } else if (fault_reason < ARRAY_SIZE(dma_remap_fault_reasons)) {
                 *fault_type = DMA_REMAP;
                 return dma_remap_fault_reasons[fault_reason];