Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932465Ab3ENPpE (ORCPT ); Tue, 14 May 2013 11:45:04 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:48350 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758004Ab3ENPjJ (ORCPT ); Tue, 14 May 2013 11:39:09 -0400 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 02/20] ARM: zynq: Remove init_irq declaration in machine description Date: Tue, 14 May 2013 17:38:35 +0200 Message-Id: <1368545933-7430-3-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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1337 Lines: 39 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 zynq as well. Signed-off-by: Maxime Ripard Acked-by: Michal Simek --- arch/arm/mach-zynq/common.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 5bfe703..4c0199b8 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -106,7 +105,6 @@ static const char * const zynq_dt_match[] = { MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .smp = smp_ops(zynq_smp_ops), .map_io = zynq_map_io, - .init_irq = irqchip_init, .init_machine = zynq_init_machine, .init_time = zynq_timer_init, .dt_compat = zynq_dt_match, -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/