aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-08-12 21:36:35 -0700
committerRalf Baechle <ralf@linux-mips.org>2017-09-04 13:53:14 +0200
commit56d7b61dc6d4e13cef786c8e4a2bfe43e4db932d (patch)
tree8269b204e316806b0b9ae8c9789621d37c1decc6
parentMIPS: Use mips_gic_present() in place of gic_present (diff)
downloadlinux-dev-56d7b61dc6d4e13cef786c8e4a2bfe43e4db932d.tar.xz
linux-dev-56d7b61dc6d4e13cef786c8e4a2bfe43e4db932d.zip
irqchip: mips-gic: Remove gic_present
Nothing uses the global gic_present variable anymore; mips_gic_present() should be used instead. Remove the dead code. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/17045/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--drivers/irqchip/irq-mips-gic.c2
-rw-r--r--include/linux/irqchip/mips-gic.h6
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 4ef3f53225ca..b444bef6d3c2 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -39,7 +39,6 @@
#define GIC_SHARED_TO_HWIRQ(x) (GIC_SHARED_HWIRQ_BASE + (x))
#define GIC_HWIRQ_TO_SHARED(x) ((x) - GIC_SHARED_HWIRQ_BASE)
-unsigned int gic_present;
void __iomem *mips_gic_base;
struct gic_pcpu_mask {
@@ -781,7 +780,6 @@ static int __init gic_of_init(struct device_node *node,
/* Ensure GIC region is enabled before trying to access it */
__sync();
}
- gic_present = true;
__gic_init(gic_base, gic_len, cpu_vec, 0, node);
diff --git a/include/linux/irqchip/mips-gic.h b/include/linux/irqchip/mips-gic.h
index 63c5f87034c9..113010c8dd8b 100644
--- a/include/linux/irqchip/mips-gic.h
+++ b/include/linux/irqchip/mips-gic.h
@@ -17,16 +17,10 @@
#ifdef CONFIG_MIPS_GIC
-extern unsigned int gic_present;
-
extern int gic_get_c0_compare_int(void);
extern int gic_get_c0_perfcount_int(void);
extern int gic_get_c0_fdc_int(void);
-#else /* CONFIG_MIPS_GIC */
-
-#define gic_present 0
-
#endif /* CONFIG_MIPS_GIC */
#endif /* __LINUX_IRQCHIP_MIPS_GIC_H */