[ARM] tegra: Combine tegra_fiq_select with enable/disable

Change-Id: Iba3dc43e1a95993a6278eea008c7a8610ed0cd4c
Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/arch/arm/mach-tegra/fiq.c b/arch/arm/mach-tegra/fiq.c
index 81f573b1a1dcea2f3dfa60b12db2dc0d9ffe94cf..d5470169b553e8f0599f526767694af0edb9d5c6 100644 (file)
--- a/arch/arm/mach-tegra/fiq.c
+++ b/arch/arm/mach-tegra/fiq.c
@@ -39,15 +39,12 @@ void tegra_fiq_enable(int irq)
        val &= ~8; /* pass FIQs through */
        val |= 2; /* enableNS */
        writel(val, base + GIC_CPU_CTRL);
+       tegra_legacy_select_fiq(irq, true);
        tegra_legacy_unmask_irq(irq);
 }
 
 void tegra_fiq_disable(int irq)
 {
        tegra_legacy_mask_irq(irq);
-}
-
-void tegra_fiq_select(int irq, int on)
-{
-       tegra_legacy_select_fiq(irq, !!on);
+       tegra_legacy_select_fiq(irq, false);
 }

diff --git a/arch/arm/mach-tegra/include/mach/fiq.h b/arch/arm/mach-tegra/include/mach/fiq.h
index b538629c74a9cf494c189bcd5ae7cf8f63f39477..17625facf62726371c3666727691e23a711ea2dd 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/fiq.h
+++ b/arch/arm/mach-tegra/include/mach/fiq.h
@@ -18,15 +18,8 @@
 #ifndef __ASM_ARCH_TEGRA_FIQ_H
 #define __ASM_ARCH_TEGRA_FIQ_H
 
-/* change an interrupt to be an FIQ instead of an IRQ */
-void tegra_fiq_select(int n, int on);
-
 /* enable/disable an interrupt that is an FIQ (safe from FIQ context?) */
 void tegra_fiq_enable(int n);
 void tegra_fiq_disable(int n);
 
-/* install an FIQ handler */
-int tegra_fiq_set_handler(void (*func)(void *data, void *regs, void *svc_sp),
-               void *data);
-
 #endif