From patchwork Tue Oct 13 12:56:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Porquet X-Patchwork-Id: 7385041 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E6091BF90C for ; Tue, 13 Oct 2015 13:08:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E57F206F0 for ; Tue, 13 Oct 2015 13:08:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DEFF20747 for ; Tue, 13 Oct 2015 13:08:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932266AbbJMNH5 (ORCPT ); Tue, 13 Oct 2015 09:07:57 -0400 Received: from 2.mo69.mail-out.ovh.net ([178.33.251.80]:55350 "EHLO 2.mo69.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932234AbbJMNH4 (ORCPT ); Tue, 13 Oct 2015 09:07:56 -0400 X-Greylist: delayed 574 seconds by postgrey-1.27 at vger.kernel.org; Tue, 13 Oct 2015 09:07:56 EDT Received: from mail643.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo69.mail-out.ovh.net (Postfix) with SMTP id 906DFFFBB28 for ; Tue, 13 Oct 2015 14:58:20 +0200 (CEST) Received: from localhost (HELO queueout) (127.0.0.1) by localhost with SMTP; 13 Oct 2015 14:58:19 +0200 Received: from aaubervilliers-652-1-127-247.w90-3.abo.wanadoo.fr (HELO joel-zenbook.home) (joel@porquet.org@90.3.174.247) by ns0.ovh.net with SMTP; 13 Oct 2015 14:57:56 +0200 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 2/3] arm:imx: IRQCHIP_DECLARE macro is now accessible Date: Tue, 13 Oct 2015 14:56:14 +0200 Message-Id: <1444740975-31948-3-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: 18427603776747565082 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-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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-imx/gpc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 8c4467f..c7de608 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -269,11 +270,7 @@ static int __init imx_gpc_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, imx_gpc, "fsl,imx6q-gpc", imx_gpc_init); +IRQCHIP_DECLARE(imx_gpc, "fsl,imx6q-gpc", imx_gpc_init); void __init imx_gpc_check_dt(void) {