From patchwork Thu Jan 17 12:00:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1996391 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 35FFEDF2E1 for ; Thu, 17 Jan 2013 12:03:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tvo95-0005FR-Eq; Thu, 17 Jan 2013 12:00:35 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tvo8z-0005DV-SK for linux-arm-kernel@lists.infradead.org; Thu, 17 Jan 2013 12:00:31 +0000 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MaQ2u-1TgLeZ3O8G-00JtEs; Thu, 17 Jan 2013 13:00:16 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 0DC2C2A2814C; Thu, 17 Jan 2013 13:00:15 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xo0U-TAmhvS8; Thu, 17 Jan 2013 13:00:13 +0100 (CET) Received: from mailman.adnet.avionic-design.de (mailman.adnet.avionic-design.de [172.20.31.172]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id BBF112A2814B; Thu, 17 Jan 2013 13:00:13 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id 16D711003EA; Thu, 17 Jan 2013 13:00:10 +0100 (CET) From: Thierry Reding To: Simon Horman , Magnus Damm Subject: [PATCH] ARM: shmobile: sh73a0: Use generic irqchip_init() Date: Thu, 17 Jan 2013 13:00:13 +0100 Message-Id: <1358424013-31306-1-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.1.1 X-Provags-ID: V02:K0:ILS0Rq05wPYMhVy7HqVC2Qg3rr55/gjr1a8PxLHT7e4 ILmV+PoWE3oVv9amSP5VSOireyNCUYRhPtqHgtvjWPOf4upQvc BqgU2hKFBQP/Q9FsmRWpbWSBqMiC6ZEGrBsEp35WZrZHgux025 nkT3MiNGWRcDFXfpXcuccTGd50J7k//mUpRX6ms+A3XLgMpp+H WwmUuB2ycOy1JRgSNzpRqKwQsBcCKmP5aLgvHa6GMi/6sN3sk7 vM5eeilItdT95/+yQnAd1D78O4P/YAl9PrN3yGAfq+I7dkTCsn 4D/ptlaMZ4zIcvjTa5L3rd9aptDf2CJMbNV9Clfdc7hCb43pqN GnNtGxi6mehBTagq9AZuxuBQ+UFUNG7ldECjhIX2D8kpcEmSfi 4JbSVY2INpT5DIUVCMDk6mQlPEYPR0AXyGh1VVEhU278c60a+G 20u4y X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130117_070030_365399_3FBBB7A8 X-CRM114-Status: GOOD ( 12.54 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.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 The asm/hardware/gic.h header does no longer exist and the corresponding functionality was moved to linux/irqchip.h and linux/irqchip/arm-gic.h respectively. gic_handle_irq() and of_irq_init() are no longer available either and have been replaced by irqchip_init(). Signed-off-by: Thierry Reding --- arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 - arch/arm/mach-shmobile/intc-sh73a0.c | 9 ++------- arch/arm/mach-shmobile/setup-sh73a0.c | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c index 04e9ae5..08c95dd 100644 --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c @@ -90,7 +90,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference") .init_early = sh73a0_add_early_devices_dt, .nr_irqs = NR_IRQS_LEGACY, .init_irq = sh73a0_init_irq_dt, - .handle_irq = gic_handle_irq, .init_machine = kzm_init, .init_late = shmobile_init_late, .init_time = shmobile_timer_init, diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c index fc7c8da..91faba6 100644 --- a/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/arch/arm/mach-shmobile/intc-sh73a0.c @@ -21,9 +21,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -462,14 +462,9 @@ void __init sh73a0_init_irq(void) } #ifdef CONFIG_OF -static const struct of_device_id irq_of_match[] __initconst = { - { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, - { }, -}; - void __init sh73a0_init_irq_dt(void) { - of_irq_init(irq_of_match); + irqchip_init(); gic_arch_extn.irq_set_wake = sh73a0_set_wake; } #endif diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index abf1eb0..2ecd668 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -892,7 +891,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)") .init_early = sh73a0_add_early_devices_dt, .nr_irqs = NR_IRQS_LEGACY, .init_irq = sh73a0_init_irq_dt, - .handle_irq = gic_handle_irq, .init_machine = sh73a0_add_standard_devices_dt, .init_time = shmobile_timer_init, .dt_compat = sh73a0_boards_compat_dt,