From patchwork Mon May 13 09:44:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 2557521 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 37780DF2E5 for ; Mon, 13 May 2013 09:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751Ab3EMJrJ (ORCPT ); Mon, 13 May 2013 05:47:09 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:41634 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083Ab3EMJoj (ORCPT ); Mon, 13 May 2013 05:44:39 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 107CAB9B; Mon, 13 May 2013 11:44:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 6CF8C78E; Mon, 13 May 2013 11:44:38 +0200 (CEST) From: Maxime Ripard To: Maxime Ripard , Michal Simek , Linus Walleij , Jamie Iles , Simon Horman , Magnus Damm , Christian Daudt , Viresh Kumar , David Brown , Jason Cooper , Andrew Lunn , Gregory Clement , Shawn Guo , Barry Song , Tony Prisk Cc: linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Arnd Bergmann , Olof Johansson Subject: [PATCH 08/14] ARM: msm: Remove init_irq declaration in machine description Date: Mon, 13 May 2013 11:44:07 +0200 Message-Id: <1368438253-28218-9-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1368438253-28218-1-git-send-email-maxime.ripard@free-electrons.com> References: <1368438253-28218-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is specified") removed the need to explictly setup the init_irq field in the machine description when using only irqchip_init. Remove that declaration for msm as well. Signed-off-by: Maxime Ripard --- arch/arm/mach-msm/board-dt-8660.c | 1 - arch/arm/mach-msm/board-dt-8960.c | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c index 7dcfc53..1360226 100644 --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c @@ -44,7 +44,6 @@ static const char *msm8x60_fluid_match[] __initdata = { DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") .smp = smp_ops(msm_smp_ops), .map_io = msm_map_msm8x60_io, - .init_irq = irqchip_init, .init_machine = msm8x60_dt_init, .init_late = msm8x60_init_late, .init_time = msm_dt_timer_init, diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c index 7301936..1e8eb1d 100644 --- a/arch/arm/mach-msm/board-dt-8960.c +++ b/arch/arm/mach-msm/board-dt-8960.c @@ -31,7 +31,6 @@ static const char * const msm8960_dt_match[] __initconst = { DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)") .smp = smp_ops(msm_smp_ops), .map_io = msm_map_msm8960_io, - .init_irq = irqchip_init, .init_time = msm_dt_timer_init, .init_machine = msm_dt_init, .dt_compat = msm8960_dt_match,