diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2017-08-12 21:36:34 -0700 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-09-04 13:53:14 +0200 |
| commit | 72eb29951f98f612ba5a5bb8c58c87eaf8fb7351 (patch) | |
| tree | a25e73a3318aba7823126417503c3565fe900dba /arch/mips/generic | |
| parent | 85eec73ce4c4322b3b442b9582f6656abb5d125f (diff) | |
| download | linux-72eb29951f98f612ba5a5bb8c58c87eaf8fb7351.tar.gz linux-72eb29951f98f612ba5a5bb8c58c87eaf8fb7351.tar.bz2 linux-72eb29951f98f612ba5a5bb8c58c87eaf8fb7351.zip | |
MIPS: Use mips_gic_present() in place of gic_present
In preparation for removing the gic_present global variable, switch to
using the mips_gic_present() function instead. For the most part this is
a straightforward substitution. In cases which previously wrapped the
GIC case in an #ifdef CONFIG_MIPS_GIC that #ifdef has been removed,
since mips_gic_present() will return a compile-time constant false
allowing the affected code to be optimised out anyway.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17044/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/generic')
| -rw-r--r-- | arch/mips/generic/irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/generic/irq.c b/arch/mips/generic/irq.c index efe359ce2576..2d7bf74179d5 100644 --- a/arch/mips/generic/irq.c +++ b/arch/mips/generic/irq.c @@ -16,6 +16,7 @@ #include <linux/types.h> #include <asm/irq.h> +#include <asm/mips-cps.h> #include <asm/time.h> int get_c0_fdc_int(void) @@ -24,7 +25,7 @@ int get_c0_fdc_int(void) if (cpu_has_veic) panic("Unimplemented!"); - else if (gic_present) + else if (mips_gic_present()) mips_cpu_fdc_irq = gic_get_c0_fdc_int(); else if (cp0_fdc_irq >= 0) mips_cpu_fdc_irq = MIPS_CPU_IRQ_BASE + cp0_fdc_irq; @@ -40,7 +41,7 @@ int get_c0_perfcount_int(void) if (cpu_has_veic) panic("Unimplemented!"); - else if (gic_present) + else if (mips_gic_present()) mips_cpu_perf_irq = gic_get_c0_perfcount_int(); else if (cp0_perfcount_irq >= 0) mips_cpu_perf_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq; @@ -56,7 +57,7 @@ unsigned int get_c0_compare_int(void) if (cpu_has_veic) panic("Unimplemented!"); - else if (gic_present) + else if (mips_gic_present()) mips_cpu_timer_irq = gic_get_c0_compare_int(); else mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq; |