From 5595c0209f9b130b31190bbd0f9af3984cba24fc Mon Sep 17 00:00:00 2001 From: Abhimanyu Kapur Date: Mon, 23 Sep 2013 17:24:35 -0700 Subject: Revert "ARM: gic: Remove ARCH_MSM8625 around the gic_save APIs" This reverts commit 991d7099f512653500ea000b0116b5b3307a6d33. Dropping support for MSM8625. Change-Id: I4f0042d94109c0ec1f0fc26335e5a47e324878dc Signed-off-by: Abhimanyu Kapur --- drivers/irqchip/irq-gic.c | 18 +----------------- include/linux/irqchip/arm-gic.h | 3 ++- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 3036a71eaaa4..fced7d634978 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -859,22 +859,6 @@ static void __init gic_pm_init(struct gic_chip_data *gic) static void __init gic_pm_init(struct gic_chip_data *gic) { } - -static void gic_cpu_restore(unsigned int gic_nr) -{ -} - -static void gic_cpu_save(unsigned int gic_nr) -{ -} - -static void gic_dist_restore(unsigned int gic_nr) -{ -} - -static void gic_dist_save(unsigned int gic_nr) -{ -} #endif #ifdef CONFIG_SMP @@ -1227,7 +1211,6 @@ unsigned int msm_gic_spi_ppi_pending(void) return 0; } -#endif void msm_gic_save(bool modem_wake, int from_idle) { @@ -1287,3 +1270,4 @@ void gic_configure_and_raise(unsigned int irq, unsigned int cpu) raw_spin_unlock_irqrestore(&irq_controller_lock, flags); } +#endif diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 6d1f5146bdbb..c29a3615e888 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -79,9 +79,10 @@ static inline void gic_init(unsigned int nr, int start, gic_init_bases(nr, start, dist, cpu, 0, NULL); } +#ifdef CONFIG_ARCH_MSM8625 void msm_gic_save(bool modem_wake, int from_idle); void msm_gic_restore(void); void gic_configure_and_raise(unsigned int irq, unsigned int cpu); #endif - +#endif #endif -- cgit v1.2.3