From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932217AbbJMNHt (ORCPT ); Tue, 13 Oct 2015 09:07:49 -0400 Received: from 6.mo69.mail-out.ovh.net ([46.105.50.107]:44967 "EHLO 6.mo69.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752493AbbJMNHs (ORCPT ); Tue, 13 Oct 2015 09:07:48 -0400 X-Greylist: delayed 588 seconds by postgrey-1.27 at vger.kernel.org; Tue, 13 Oct 2015 09:07:48 EDT From: Joel Porquet To: linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, kgene@kernel.org, k.kozlowski@samsung.com, shawnguo@kernel.org, kernel@pengutronix.de, tony@atomide.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org, Joel Porquet Subject: [PATCH v2 3/3] arm:omap2: IRQCHIP_DECLARE macro is now accessible Date: Tue, 13 Oct 2015 14:56:15 +0200 Message-Id: <1444740975-31948-4-git-send-email-joel@porquet.org> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444740975-31948-1-git-send-email-joel@porquet.org> References: <1444740975-31948-1-git-send-email-joel@porquet.org> X-Ovh-Tracer-Id: 18434640651165331483 X-Ovh-Remote: 90.3.174.247 (aaubervilliers-652-1-127-247.w90-3.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: 0 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekgedrkeehucetufdoteggucfrrhhofhhilhgvmecuqfggjfenuceurghilhhouhhtmecufedttdenuc X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekgedrkeehucetufdoteggucfrrhhofhhilhgvmecuqfggjfenuceurghilhhouhhtmecufedttdenuc Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h', making it globally accessible. See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). This patch adds the inclusion of 'include/linux/irqchip.h' and replaces the use of OF_DECLARE_2 with IRQCHIP_DECLARE. Signed-off-by: Joel Porquet --- arch/arm/mach-omap2/omap-wakeupgen.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index e1d2e99..a2dc324 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -538,8 +539,4 @@ static int __init wakeupgen_init(struct device_node *node, return 0; } -/* - * We cannot use the IRQCHIP_DECLARE macro that lives in - * drivers/irqchip, so we're forced to roll our own. Not very nice. - */ -OF_DECLARE_2(irqchip, ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init); +IRQCHIP_DECLARE(ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init); -- 2.6.1