From patchwork Thu Jan 3 17:54:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1928551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id EEDE8DF25A for ; Thu, 3 Jan 2013 17:59:09 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tqp1K-0007sS-5H; Thu, 03 Jan 2013 17:55:58 +0000 Received: from mail-ye0-f173.google.com ([209.85.213.173]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tqp0G-0007aL-0P for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 17:54:53 +0000 Received: by mail-ye0-f173.google.com with SMTP id l5so2458528yen.32 for ; Thu, 03 Jan 2013 09:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=P+y12TzTYJ+9NOb8/Jq95+15cTxpsY7gEucRNShHsoA=; b=xBCkxqKTejTlYyzBevxZPlQl6o62QG3Vn4RdaDiMC9M1GpoQmPRdJudTvcAt7ukUTC bPjRUa4l6/2lHFrl/3/IUbCcyQ6hHkV8oEdgSw8wTy+dRdTRNi+RRB+2VOHwW4W10brb wSpT9eKr/vNewVBWef2xruj4bc/39s2/Usl+qnvfclW5WnsuzFUC7OUXViQyWgS15XHk evc57NOER+dsFN7irqpL6j2BBB6PYDUlFbIkFUqgVhMzRxK1fGBvnxNZ59j/IK7odY7n Ml1+hUkcS1lVu8y9urZz6PJsqiUPb6LuF2MFggcLECKyLq0LcMWyYD8T3sajhSXpFrcD 4vHA== X-Received: by 10.236.118.19 with SMTP id k19mr51746676yhh.90.1357235690698; Thu, 03 Jan 2013 09:54:50 -0800 (PST) Received: from rob-laptop.calxeda.com ([173.226.190.120]) by mx.google.com with ESMTPS id q4sm44227297anp.18.2013.01.03.09.54.49 (version=SSLv3 cipher=OTHER); Thu, 03 Jan 2013 09:54:50 -0800 (PST) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 04/19] ARM: GIC: remove assembly ifdefs from gic.h Date: Thu, 3 Jan 2013 11:54:13 -0600 Message-Id: <1357235668-9450-5-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357235668-9450-1-git-send-email-robherring2@gmail.com> References: <1357235668-9450-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130103_125452_300282_09660A1B X-CRM114-Status: UNSURE ( 9.48 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.173 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Olof Johansson , thomas.petazzoni@free-electrons.com, Russell King , Rob Herring , Arnd Bergmann 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 From: Rob Herring With multi irq handler and all GIC users converted to it, we don't need asm/hardware/gic.h to be included in assembly. Clean-up ifdefs and unnecessary includes. Signed-off-by: Rob Herring Acked-by: Olof Johansson --- arch/arm/include/asm/hardware/gic.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h index 4b1ce6c..fc59698 100644 --- a/arch/arm/include/asm/hardware/gic.h +++ b/arch/arm/include/asm/hardware/gic.h @@ -10,8 +10,6 @@ #ifndef __ASM_ARM_HARDWARE_GIC_H #define __ASM_ARM_HARDWARE_GIC_H -#include - #define GIC_CPU_CTRL 0x00 #define GIC_CPU_PRIMASK 0x04 #define GIC_CPU_BINPOINT 0x08 @@ -32,8 +30,6 @@ #define GIC_DIST_CONFIG 0xc00 #define GIC_DIST_SOFTINT 0xf00 -#ifndef __ASSEMBLY__ -#include struct device_node; extern struct irq_chip gic_arch_extn; @@ -53,5 +49,3 @@ static inline void gic_init(unsigned int nr, int start, } #endif - -#endif