From patchwork Fri Nov 23 00:50:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 1793441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id CEDD33FC64 for ; Fri, 23 Nov 2012 00:59:01 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbhYQ-0007Fu-Dm; Fri, 23 Nov 2012 00:55:39 +0000 Received: from mail-oa0-f49.google.com ([209.85.219.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbhWe-0006XP-0u for linux-arm-kernel@lists.infradead.org; Fri, 23 Nov 2012 00:53:50 +0000 Received: by mail-oa0-f49.google.com with SMTP id l10so8321102oag.36 for ; Thu, 22 Nov 2012 16:53:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=o/MOyz2YO3XoSdxPqihvitrlw9GtXoySwQ9dTyPlMw0=; b=VXJx8eUOYSntazt4Gk63DF61mW/dn+dmBFSZQDjMBsXnuJivo624lSAUhf0R9Jcu2N joUkMjR01yQH0uWw7wngVzQwcYVSqbCQbpdAIlw27r/CWDJMAwmCb7t5B+6rNLJQTMwi oMloEUmDq1I5pQuPdVPQxwRsc2UfoNHaqkQtoDl8AgsdSoqE3iJHTPlq2eo2FPZt7c+g RztmwiBRQx52u4QfnQPMQvdCUz6sc7i00z2Tx9tOgXEv10/ghPd5F6++lyJuZj/OWXL4 0h5ZfCNNQSng/Ph63bkyUJ/hmrvIz1+3zqFzFBz14B7zgFstxgk850JzGDRkzqy9t+9o keGw== Received: by 10.60.3.231 with SMTP id f7mr1726821oef.43.1353632027820; Thu, 22 Nov 2012 16:53:47 -0800 (PST) Received: from localhost (ip-64-134-239-153.public.wayport.net. [64.134.239.153]) by mx.google.com with ESMTPS id jd1sm4471745obb.8.2012.11.22.16.53.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:53:47 -0800 (PST) From: Anton Vorontsov To: Andrew Morton Subject: [PATCH 08/10] ARM: FIQ: Implement !CONFIG_FIQ stubs Date: Thu, 22 Nov 2012 16:50:01 -0800 Message-Id: <1353631803-4853-8-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.8.0 In-Reply-To: <20121123003849.GA973@lizard.mcd25758.sjc.wayport.net> References: <20121123003849.GA973@lizard.mcd25758.sjc.wayport.net> X-Gm-Message-State: ALoCoQmB4V3AsJaPwJAu6xTcxrJTo+Z5xgIeCioooFUO1gHpix+6IErI+D+P3bY6A6rP0WX1ihhd X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_195348_210741_9265AC0B X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-kernel@lists.linaro.org, Russell King , patches@linaro.org, linux-kernel@vger.kernel.org, John Stultz , Jason Wessel , kernel-team@android.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Simply removes ugly #ifdefs from C code. Signed-off-by: Anton Vorontsov --- arch/arm/include/asm/mach/irq.h | 5 +++++ arch/arm/kernel/irq.c | 2 -- arch/arm/plat-mxc/avic.c | 2 -- arch/arm/plat-mxc/tzic.c | 2 -- arch/arm/plat-s3c24xx/irq.c | 2 -- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h index febe495..420d211 100644 --- a/arch/arm/include/asm/mach/irq.h +++ b/arch/arm/include/asm/mach/irq.h @@ -17,8 +17,13 @@ struct seq_file; /* * This is internal. Do not use it. */ +#ifdef CONFIG_FIQ extern void init_FIQ(void); extern int show_fiq_list(struct seq_file *, int); +#else +static inline void init_FIQ(void) {} +static inline int show_fiq_list(struct seq_file *p, int prec) { return 0; } +#endif #ifdef CONFIG_MULTI_IRQ_HANDLER extern void (*handle_arch_irq)(struct pt_regs *); diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 8961650..00911e5 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -45,9 +45,7 @@ unsigned long irq_err_count; int arch_show_interrupts(struct seq_file *p, int prec) { -#ifdef CONFIG_FIQ show_fiq_list(p, prec); -#endif #ifdef CONFIG_SMP show_ipi_list(p, prec); #endif diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c index 19701ec..426980c 100644 --- a/arch/arm/plat-mxc/avic.c +++ b/arch/arm/plat-mxc/avic.c @@ -216,10 +216,8 @@ void __init mxc_init_irq(void __iomem *irqbase) for (i = 0; i < 8; i++) __raw_writel(0, avic_base + AVIC_NIPRIORITY(i)); -#ifdef CONFIG_FIQ /* Initialize FIQ */ init_FIQ(); -#endif printk(KERN_INFO "MXC IRQ initialized\n"); } diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c index d09b573..8a5a633 100644 --- a/arch/arm/plat-mxc/tzic.c +++ b/arch/arm/plat-mxc/tzic.c @@ -191,10 +191,8 @@ void __init tzic_init_irq(void __iomem *irqbase) for (i = 0; i < 4; i++, irq_base += 32) tzic_init_gc(i, irq_base); -#ifdef CONFIG_FIQ /* Initialize FIQ */ init_FIQ(); -#endif pr_info("TrustZone Interrupt Controller (TZIC) initialized\n"); } diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index e0de92a..531d6a4 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c @@ -532,9 +532,7 @@ void __init s3c24xx_init_irq(void) int irqno; int i; -#ifdef CONFIG_FIQ init_FIQ(); -#endif irqdbf("s3c2410_init_irq: clearing interrupt status flags\n");