From patchwork Sun Aug 5 23:03:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 10495 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 0476324048 for ; Sun, 5 Aug 2012 23:08:44 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id C7AA0A18036 for ; Sun, 5 Aug 2012 23:08:43 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so1998454yen.11 for ; Sun, 05 Aug 2012 16:08:43 -0700 (PDT) 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=47ZAEhVE+i8zu1Jut3nOBiGkKnomy4+ihXOes5DQxRM=; b=XuXlxZdyOoueZDR7tcwmhVYCQVVETg1bpgBM8T873vtc/jUidY2033OkkZbTjszJAK 2w8XFv0LznYg2NBKgd/EGN0Dx27DXMATC35qauJl35lSUlWU4qTvH61Jv6gE2OFNdZ+3 OjaGE2oBQwcfK/nDTfhPcgqpUDV12wvtIrKu8UnaTUMLmmnQXKPq9cYbn836eZ630ecS pY0lukz1Bp6y8vpOSfLa8DxdGN7+qj7+m5l+T5Y52PRS5zB68h1m/I9KEe36zz4MFHDO kQJt4dO4PyR1RDQYuJyf44QFi7mkkIj6Jd31RfKrX4ZikRBe4wb01lFVBZ1Vuza2tme9 KbxQ== Received: by 10.50.149.134 with SMTP id ua6mr3858342igb.11.1344208123333; Sun, 05 Aug 2012 16:08:43 -0700 (PDT) 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.87.40 with SMTP id u8csp412180igz; Sun, 5 Aug 2012 16:08:42 -0700 (PDT) Received: by 10.66.80.165 with SMTP id s5mr14089778pax.41.1344208122776; Sun, 05 Aug 2012 16:08:42 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id ot8si5750800pbb.339.2012.08.05.16.08.42 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 16:08:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 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-pb0-f50.google.com with SMTP id md12so3222754pbc.37 for ; Sun, 05 Aug 2012 16:08:42 -0700 (PDT) Received: by 10.66.72.197 with SMTP id f5mr14095431pav.20.1344208122137; Sun, 05 Aug 2012 16:08:42 -0700 (PDT) Received: from localhost (m9f0536d0.tmodns.net. [208.54.5.159]) by mx.google.com with ESMTPS id iq1sm4015592pbc.37.2012.08.05.16.08.37 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 16:08:41 -0700 (PDT) From: Anton Vorontsov To: Russell King Cc: 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, Ben Dooks , Kukjin Kim , Sascha Hauer , Tony Lindgren , Mark Brown , Liam Girdwood Subject: [PATCH 8/9] ARM: FIQ: Implement !CONFIG_FIQ stubs Date: Sun, 5 Aug 2012 16:03:38 -0700 Message-Id: <1344207819-3415-8-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120805230238.GA1663@lizard> References: <20120805230238.GA1663@lizard> X-Gm-Message-State: ALoCoQmdoo44OIH/ewv7eior/5/HhPWny/T5yRtdZ6UcusStt9Hi7KMNS/hWZ+EawwSErxXDbExl 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 16cedb4..8013ad9 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -44,9 +44,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");