x86, apic: remove IRQ_DEST_MODE / IRQ_DELIVERY_MODE

Remove the wrapper macros IRQ_DEST_MODE and IRQ_DELIVERY_MODE.

The typical 32-bit and the 64-bit build all dereference via the genapic,
so it's pointless to hide that indirection via these ugly macros.

Furthermore, it also obscures subarchitecture details.

So replace it with apic->irq_dest_mode / etc. accesses.

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

5 files changed, 10 insertions, 10 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index c15c1aa2dc7f..e8c1ceca7c94 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -64,8 +64,8 @@ struct genapic apic_bigsmp = {
         .acpi_madt_oem_check            = NULL,
         .apic_id_registered             = bigsmp_apic_id_registered,
 
-        .irq_delivery_mode              = IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = IRQ_DEST_MODE,
+        .irq_delivery_mode              = BIGSMP_IRQ_DELIVERY_MODE,
+        .irq_dest_mode                  = BIGSMP_IRQ_DEST_MODE,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index d32b175eff88..0482106f0e19 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -31,8 +31,8 @@ struct genapic apic_default = {
         .acpi_madt_oem_check            = NULL,
         .apic_id_registered             = default_apic_id_registered,
 
-        .irq_delivery_mode              = IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = IRQ_DEST_MODE,
+        .irq_delivery_mode              = DEFAULT_IRQ_DELIVERY_MODE,
+        .irq_dest_mode                  = DEFAULT_IRQ_DEST_MODE,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 06653892953e..5d97408919bb 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -107,8 +107,8 @@ struct genapic apic_es7000 = {
         .acpi_madt_oem_check            = es7000_acpi_madt_oem_check,
         .apic_id_registered             = es7000_apic_id_registered,
 
-        .irq_delivery_mode              = IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = IRQ_DEST_MODE,
+        .irq_delivery_mode              = ES7000_IRQ_DELIVERY_MODE,
+        .irq_dest_mode                  = ES7000_IRQ_DEST_MODE,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 401957142fda..77ac66935fdd 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -51,8 +51,8 @@ struct genapic apic_numaq = {
         .acpi_madt_oem_check            = NULL,
         .apic_id_registered             = numaq_apic_id_registered,
 
-        .irq_delivery_mode              = IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = IRQ_DEST_MODE,
+        .irq_delivery_mode              = NUMAQ_IRQ_DELIVERY_MODE,
+        .irq_dest_mode                  = NUMAQ_IRQ_DEST_MODE,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 946da7aa7622..7b3f43caf2ae 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -44,8 +44,8 @@ struct genapic apic_summit = {
         .acpi_madt_oem_check            = summit_acpi_madt_oem_check,
         .apic_id_registered             = summit_apic_id_registered,
 
-        .irq_delivery_mode              = IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = IRQ_DEST_MODE,
+        .irq_delivery_mode              = SUMMIT_IRQ_DELIVERY_MODE,
+        .irq_dest_mode                  = SUMMIT_IRQ_DEST_MODE,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,