x86, apic: remove ES7000_IRQ_DELIVERY_MODE and ES7000_IRQ_DEST_MODE

Impact: cleanup

They were only used in a single place and obscured the apic_es7000
driver template.

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

2 files changed, 3 insertions, 4 deletions

diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index 690016683f21..342416b3fadd 100644
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -27,8 +27,6 @@ static inline const cpumask_t *target_cpus(void)
 #define NO_BALANCE_IRQ_CLUSTER          (1)
 
 #define APIC_DFR_VALUE          (APIC_DFR_FLAT)
-#define ES7000_IRQ_DELIVERY_MODE (dest_Fixed)
-#define ES7000_IRQ_DEST_MODE    (0)    /* phys delivery to target procs */
 #define NO_BALANCE_IRQ          (0)
 #undef  APIC_DEST_LOGICAL
 #define APIC_DEST_LOGICAL       0x0
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 5d97408919bb..269a97aef431 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -107,8 +107,9 @@ struct genapic apic_es7000 = {
         .acpi_madt_oem_check            = es7000_acpi_madt_oem_check,
         .apic_id_registered             = es7000_apic_id_registered,
 
-        .irq_delivery_mode              = ES7000_IRQ_DELIVERY_MODE,
-        .irq_dest_mode                  = ES7000_IRQ_DEST_MODE,
+        .irq_delivery_mode              = dest_Fixed,
+        /* phys delivery to target CPUs: */
+        .irq_dest_mode                  = 0,
 
         .target_cpus                    = target_cpus,
         .ESR_DISABLE                    = esr_disable,