From 08c6385bf93dd2255c55e193b341a9ba103adf21 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 4 Oct 2010 18:22:56 -0700 Subject: [PATCH] [ARM] tegra: Combine tegra_fiq_select with enable/disable Change-Id: Iba3dc43e1a95993a6278eea008c7a8610ed0cd4c Signed-off-by: Colin Cross --- arch/arm/mach-tegra/fiq.c | 7 ++----- arch/arm/mach-tegra/include/mach/fiq.h | 7 ------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-tegra/fiq.c b/arch/arm/mach-tegra/fiq.c index 81f573b1a1dc..d5470169b553 100644 --- 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 b538629c74a9..17625facf627 100644 --- 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 -- 2.34.1