From patchwork Mon Jul 28 21:16:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 34427 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 57020202E4 for ; Mon, 28 Jul 2014 21:21:24 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id s7sf22622857qap.10 for ; Mon, 28 Jul 2014 14:21:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=nFtt2rrahA6hE/YhHdArUwMLBOtUPb+Vhxh+KT9XcBA=; b=mR0LuTxFsnpktlsqwlX/NqPOwDUxLoalM8+CLbF/l3c/0fEYNFWy0lGTgAxzsAgG0p f14bGAVyG+x0nAE1R+a4v881oPq4lZNoVRT+BghxpMy534tY+NRNjYnIPjF8FChiG7lY RiDUxJU2C1HKFFy2wkdZbruYPi4wsffMUhthV9UyHyhJI3LpnHEbsYL++twsprW1LaTM N/wHZ3J4H8EJN6d3wn/hj+795a0A5VQxOF99b4YIaTd9tO2N4zbCWxNFyLNBGriVUXhF NBgqaYvbzFhcCxVQKil2BaFfeWLziX6+CIS7YKue1ErjGiMvF+7w2g3zFCN3JF41fCHu SmTA== X-Gm-Message-State: ALoCoQmUdbgjvWCypzH1c6aST6J8B+UgIfobEK3ivbRKRzEzynRgZB6xH1RfIB6ZxGspKS5eEvM/ X-Received: by 10.236.23.230 with SMTP id v66mr14710544yhv.53.1406582484202; Mon, 28 Jul 2014 14:21:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.232 with SMTP id n95ls2315114qgn.23.gmail; Mon, 28 Jul 2014 14:21:24 -0700 (PDT) X-Received: by 10.52.61.99 with SMTP id o3mr114197vdr.46.1406582484073; Mon, 28 Jul 2014 14:21:24 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id wv11si2587303vcb.35.2014.07.28.14.21.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 14:21:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so12131426vcb.26 for ; Mon, 28 Jul 2014 14:21:24 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr135851vdc.24.1406582483981; Mon, 28 Jul 2014 14:21:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp197191vcb; Mon, 28 Jul 2014 14:21:21 -0700 (PDT) X-Received: by 10.66.176.97 with SMTP id ch1mr33341905pac.101.1406582475079; Mon, 28 Jul 2014 14:21:15 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id hb1si19047844pbd.26.2014.07.28.14.21.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jul 2014 14:21:15 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBsKf-0005EE-Cf; Mon, 28 Jul 2014 21:19:45 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBsId-0003a6-Nz for linux-arm-kernel@bombadil.infradead.org; Mon, 28 Jul 2014 21:17:39 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBsIa-0005op-8N for linux-arm-kernel@lists.infradead.org; Mon, 28 Jul 2014 21:17:38 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s6SLH0QF018913; Mon, 28 Jul 2014 16:17:00 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s6SLH0tk014575; Mon, 28 Jul 2014 16:17:00 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Mon, 28 Jul 2014 16:17:00 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s6SLGxQj027539; Mon, 28 Jul 2014 16:16:59 -0500 From: Felipe Balbi To: Tony Lindgren Subject: [PATCH 14/35] arm: omap: irq: use IRQCHIP_DECLARE macro Date: Mon, 28 Jul 2014 16:16:02 -0500 Message-ID: <1406582183-696-15-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.0.1.563.g66f467c In-Reply-To: <1406582183-696-1-git-send-email-balbi@ti.com> References: <1406582183-696-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140728_221736_615098_0F93349F X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.4.0 on casper.infradead.org summary: Content analysis details: (-7.6 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [198.47.26.153 listed in wl.mailspike.net] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: devicetree@vger.kernel.org, linux@arm.linux.org.uk, jason@lakedaemon.net, khilman@deeprootsystems.com, Linux Kernel Mailing List , Felipe Balbi , bcousson@baylibre.com, tglx@linutronix.de, Linux OMAP Mailing List , Linux ARM Kernel Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 IRQCHIP_DECLARE macro is used to declare the same of_device_id structure for irqchips, it's just a helper. No functional changes. Note that we're temporarily including irqchip.h with its full path, until we move this driver to drivers/irqchip/. Signed-off-by: Felipe Balbi --- arch/arm/mach-omap2/irq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index e452411..2801243 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -26,6 +26,7 @@ #include "soc.h" #include "iomap.h" #include "common.h" +#include "../../drivers/irqchip/irqchip.h" /* selected INTC register offsets */ @@ -319,14 +320,11 @@ static int __init intc_of_init(struct device_node *node, return 0; } -static struct of_device_id irq_match[] __initdata = { - { .compatible = "ti,omap2-intc", .data = intc_of_init, }, - { } -}; +IRQCHIP_DECLARE(omap_intc, "ti,omap2-intc", intc_of_init); void __init omap_intc_of_init(void) { - of_irq_init(irq_match); + of_irq_init(&irqchip_of_match_omap_intc); } asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs)