From: Paul Burton Date: Sun, 13 Aug 2017 04:36:35 +0000 (-0700) Subject: irqchip: mips-gic: Remove gic_present X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=56d7b61dc6d4e13cef786c8e4a2bfe43e4db932d;p=openwrt%2Fstaging%2Fblogic.git 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 Acked-by: Marc Zyngier Cc: Jason Cooper Cc: Thomas Gleixner Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/17045/ Signed-off-by: Ralf Baechle --- 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 */