x86, genapic: rename int_delivery_mode, et. al.

int_delivery_mode is supposed to mean 'interrupt delivery mode', but
it's quite a misnomer as 'int' we usually think of as an integer type ...

The standard naming for such attributes is 'irq' - so rename the following
fields and macros:

 int_delivery_mode => irq_delivery_mode
 INT_DELIVERY_MODE => IRQ_DELIVERY_MODE
 int_dest_mode     => irq_dest_mode
 INT_DEST_MODE     => IRQ_DEST_MODE

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index d68ca0bce675..06653892953e 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -21,8 +21,8 @@
 void __init es7000_update_genapic_to_cluster(void)
 {
         apic->target_cpus = target_cpus_cluster;
-        apic->int_delivery_mode = INT_DELIVERY_MODE_CLUSTER;
-        apic->int_dest_mode = INT_DEST_MODE_CLUSTER;
+        apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER;
+        apic->irq_dest_mode = INT_DEST_MODE_CLUSTER;
         apic->no_balance_irq = NO_BALANCE_IRQ_CLUSTER;
 
         apic->init_apic_ldr = init_apic_ldr_cluster;
@@ -107,8 +107,8 @@ struct genapic apic_es7000 = {
         .acpi_madt_oem_check            = es7000_acpi_madt_oem_check,
         .apic_id_registered             = es7000_apic_id_registered,
 
-        .int_delivery_mode              = INT_DELIVERY_MODE,
-        .int_dest_mode                  = INT_DEST_MODE,
+        .irq_delivery_mode              = IRQ_DELIVERY_MODE,
+        .irq_dest_mode                  = IRQ_DEST_MODE,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,