From patchwork Tue May 14 15:38:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 2566931 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DDA4F3FD85 for ; Tue, 14 May 2013 15:41:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932203Ab3ENPlB (ORCPT ); Tue, 14 May 2013 11:41:01 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:48531 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758135Ab3ENPj0 (ORCPT ); Tue, 14 May 2013 11:39:26 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id AE497DFD; Tue, 14 May 2013 17:39:25 +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 AF315754; Tue, 14 May 2013 17:39:24 +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 16/20] ARM: mxs: Remove init_irq declaration in machine description Date: Tue, 14 May 2013 17:38:49 +0200 Message-Id: <1368545933-7430-17-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1368545933-7430-1-git-send-email-maxime.ripard@free-electrons.com> References: <1368545933-7430-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 mxs as well. Signed-off-by: Maxime Ripard --- arch/arm/mach-mxs/mach-mxs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 5b62b64..66fe810 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -435,7 +434,6 @@ static const char *mxs_dt_compat[] __initdata = { DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") .map_io = debug_ll_io_init, - .init_irq = irqchip_init, .handle_irq = icoll_handle_irq, .init_time = mxs_timer_init, .init_machine = mxs_machine_init,