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, 5 insertions, 5 deletions

diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/intr_remapping.h
index 6f4ea0a387b1..bd5d98fec148 100644
--- a/drivers/iommu/intr_remapping.h
+++ b/drivers/iommu/intr_remapping.h
@@ -31,7 +31,7 @@ struct cpumask;
 struct pci_dev;
 struct msi_msg;
 
-extern int disable_intremap;
+extern int disable_irq_remap;
 extern int disable_sourceid_checking;
 extern int no_x2apic_optout;
 
@@ -40,16 +40,16 @@ struct irq_remap_ops {
         int (*supported)(void);
 
         /* Initializes hardware and makes it ready for remapping interrupts */
-        int  (*hardware_init)(void);
+        int  (*prepare)(void);
 
         /* Enables the remapping hardware */
-        int  (*hardware_enable)(void);
+        int  (*enable)(void);
 
         /* Disables the remapping hardware */
-        void (*hardware_disable)(void);
+        void (*disable)(void);
 
         /* Reenables the remapping hardware */
-        int  (*hardware_reenable)(int);
+        int  (*reenable)(int);
 
         /* Enable fault handling */
         int  (*enable_faulting)(void);