From patchwork Mon Oct 15 21:51:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 12246 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 E402A23EFB for ; Mon, 15 Oct 2012 21:55:03 +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 7D548A18C34 for ; Mon, 15 Oct 2012 21:55:03 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so3982751iag.11 for ; Mon, 15 Oct 2012 14:55:03 -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=zWwJ/Xn6/lropIwOe7mn1SZqc7fyD1Db1jiG59zhyEo=; b=KfqDaXBTxL5xifmqUkZkDl6+7O02kshin4hegc8IOLSgQ1MdH3ME9jnbu4T10Gz4SS B6n1G7JWulLW2qWfQXptbNJTjUo0RkrCndfypBWCfuv8Blh3y02vUACFnE0hLjmCqUES 5yMST7IL2Ln/PbaBLL14QxsPwY+DmDdW8M5hPI6sH541HGroNqXN3nyDoxBRQkap+Dwn G+uCaw//fEx1849jjzmzcp2NWA8kQpig+XUeyw+SkHaV6/C8L1PjXFEMUIbLeMKDZNvN KckvtbrjQEWCg+Z38HIunj35NcAmPwqgwgPLHioFJDRi/u9Qsqn6t5FNRsdhoysrDGsB UG3g== Received: by 10.50.91.195 with SMTP id cg3mr10112800igb.57.1350338103241; Mon, 15 Oct 2012 14:55:03 -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.67.148 with SMTP id n20csp641665igt; Mon, 15 Oct 2012 14:55:02 -0700 (PDT) Received: by 10.66.83.129 with SMTP id q1mr36518886pay.4.1350338102507; Mon, 15 Oct 2012 14:55:02 -0700 (PDT) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by mx.google.com with ESMTPS id u7si23685066paz.327.2012.10.15.14.55.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 14:55:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.220.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.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-pa0-f50.google.com with SMTP id hz11so5827690pad.37 for ; Mon, 15 Oct 2012 14:55:02 -0700 (PDT) Received: by 10.66.86.133 with SMTP id p5mr36300563paz.35.1350338102208; Mon, 15 Oct 2012 14:55:02 -0700 (PDT) Received: from localhost (ip-64-134-230-8.public.wayport.net. [64.134.230.8]) by mx.google.com with ESMTPS id mn5sm9629842pbc.12.2012.10.15.14.55.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 14:55:01 -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 08/10] ARM: FIQ: Implement !CONFIG_FIQ stubs Date: Mon, 15 Oct 2012 14:51:32 -0700 Message-Id: <1350337894-9744-8-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.12.3 In-Reply-To: <20121015214954.GA3352@lizard> References: <20121015214954.GA3352@lizard> X-Gm-Message-State: ALoCoQlousaLTnO3CaXJ18pXU6mkTlJzAxPt4m/0sxgSZSqQxU6BEsaAID3UdRyUzUL3iI/rzfB4 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");