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: 13095 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7156923E13 for ; Fri, 23 Nov 2012 00:53:49 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1AD1FA1804B for ; Fri, 23 Nov 2012 00:53:49 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so3477189iag.11 for ; Thu, 22 Nov 2012 16:53:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=o/MOyz2YO3XoSdxPqihvitrlw9GtXoySwQ9dTyPlMw0=; b=EgDg239jnoaiEd9LB4qIeeAwHjY+12o+tXJT+9Z56lFTcagbsBTaRW141qZLnpDH17 iRUw+7PwJxOyuaDZpjtXd/vwi7RBU1Cg3G/1VZqYHPE1vVigDZFQRiN7wFTqli/eKaa9 Dkzl48dj1CX/BdS4Nljq4IGj4Jh1ylf/KxqD1FN13KhjTlgxSrp0torbjiQULEjUWpHA H9iuCV0hqWfn6YRgoupeN9eV6ypADXfTStcTy+gXIT/1T1NsNyFWnenEar+rN2JkgiIH e4lfhzHcIoFaPH8yge8AbeqkD7+DJ7OYNECykJ0fHtzu43EWC2f9y+zhRcPPxECeqldt ADSw== Received: by 10.43.46.2 with SMTP id um2mr1865674icb.18.1353632028882; Thu, 22 Nov 2012 16:53:48 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp282411igt; Thu, 22 Nov 2012 16:53:48 -0800 (PST) Received: by 10.60.13.193 with SMTP id j1mr1648394oec.41.1353632028061; Thu, 22 Nov 2012 16:53:48 -0800 (PST) Received: from mail-ob0-f173.google.com (mail-ob0-f173.google.com [209.85.214.173]) by mx.google.com with ESMTPS id rq9si4309655obc.2.2012.11.22.16.53.47 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:53:48 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.173 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.214.173; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.173 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-ob0-f173.google.com with SMTP id x4so11235732obh.18 for ; Thu, 22 Nov 2012 16:53:47 -0800 (PST) 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 Cc: Russell King , Jason Wessel , John Stultz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com 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: ALoCoQngn88lLyu4bPjI1vyfVlvqi3jL3VQv73qFE4mSKVnRhQIG9Uo45xZJn4JsjKCdCIWAnrmM 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");