From patchwork Mon Jul 28 21:16:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 34416 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6BDB4202E4 for ; Mon, 28 Jul 2014 21:18:35 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id a108sf17214638qge.4 for ; Mon, 28 Jul 2014 14:18:35 -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:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=Pz5fWvIYlAXBMNYUV5v1nCZEQypH+GoZgZDEX+vV4Fo=; b=JVFhQlNoFCu+3JBOJsl3bXy+h2DgLlTBeQRicQcI0CsNr1RtQ9vqiybpnWZSNEL4Mp LBtFkM3zenF791BOA+H/SxEh6IM72oJ0mTRktfOuibSTIh+gyf2+EmKMONHftxs8oNpQ L4NrbDS0NU5gPaAfydLVpzW6XnIVuD1ZhbQ9bBuuNlei2108cW+V1u0019d9MSE0jlCR wVJMFVcTtzVPCRTlm9BH7RrVXibJGfKXvefrZukuJKKnZI//PYjPR4+P9UQQWaSAiL8/ +ty0VlQHLC0BLoJstRx0Le94hKBV9nO8XMFflpzMgm1JIWhQKRizIyhf+Gj5eGA89blY p7RA== X-Gm-Message-State: ALoCoQlAjUp75Fcnmr/v6qbr5QU1yjW+GEboV/NDB4t9odt8+u3tWyVKm7az0e6Wlj1TlX4U5F2r X-Received: by 10.236.197.226 with SMTP id t62mr14868661yhn.50.1406582315262; Mon, 28 Jul 2014 14:18:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.169 with SMTP id x38ls2306220qgx.28.gmail; Mon, 28 Jul 2014 14:18:35 -0700 (PDT) X-Received: by 10.52.164.199 with SMTP id ys7mr112777vdb.42.1406582315159; Mon, 28 Jul 2014 14:18:35 -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 zt9si13326278vdc.31.2014.07.28.14.18.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 14:18:35 -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 lf12so12410914vcb.12 for ; Mon, 28 Jul 2014 14:18:35 -0700 (PDT) X-Received: by 10.220.131.207 with SMTP id y15mr3523126vcs.71.1406582315088; Mon, 28 Jul 2014 14:18:35 -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 tc5csp197026vcb; Mon, 28 Jul 2014 14:18:34 -0700 (PDT) X-Received: by 10.66.152.171 with SMTP id uz11mr8853098pab.96.1406582314281; Mon, 28 Jul 2014 14:18:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rf4si9523686pdb.342.2014.07.28.14.18.33 for ; Mon, 28 Jul 2014 14:18:34 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752623AbaG1VSG (ORCPT + 25 others); Mon, 28 Jul 2014 17:18:06 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:55568 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752189AbaG1VRl (ORCPT ); Mon, 28 Jul 2014 17:17:41 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s6SLHAKr003912; Mon, 28 Jul 2014 16:17:10 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s6SLHAPW014927; Mon, 28 Jul 2014 16:17:10 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 28 Jul 2014 16:17:09 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s6SLH9Uh018881; Mon, 28 Jul 2014 16:17:09 -0500 From: Felipe Balbi To: Tony Lindgren CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , , , , , , , Linux Kernel Mailing List , Felipe Balbi Subject: [PATCH 24/35] arm: omap: irq: drop omap2_intc_handle_irq() Date: Mon, 28 Jul 2014 16:16:12 -0500 Message-ID: <1406582183-696-25-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 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , that was just a no-op wrapper around omap_intc_handle_irq anyway. Signed-off-by: Felipe Balbi --- arch/arm/mach-omap2/common.h | 1 - arch/arm/mach-omap2/irq.c | 16 ++++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index bc3208b..1dd0021 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -219,7 +219,6 @@ void omap_intc_restore_context(void); void omap3_intc_suspend(void); void omap3_intc_prepare_idle(void); void omap3_intc_resume_idle(void); -void omap2_intc_handle_irq(struct pt_regs *regs); void omap_gic_of_init(void); #ifdef CONFIG_CACHE_L2X0 diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 4dfeac6..14716a8 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -234,7 +234,8 @@ static void __init omap_init_irq(u32 base, int nr_irqs, omap_alloc_gc(omap_irq_base + j, j + irq_base, 32); } -static inline void omap_intc_handle_irq(struct pt_regs *regs) +static asmlinkage void __exception_irq_entry +omap_intc_handle_irq(struct pt_regs *regs) { u32 irqnr; int handled_irq = 0; @@ -276,27 +277,22 @@ out: omap_ack_irq(NULL); } -asmlinkage void __exception_irq_entry omap2_intc_handle_irq(struct pt_regs *regs) -{ - omap_intc_handle_irq(regs); -} - void __init omap2_init_irq(void) { omap_init_irq(OMAP24XX_IC_BASE, 96, NULL); - set_handle_irq(omap2_intc_handle_irq); + set_handle_irq(omap_intc_handle_irq); } void __init omap3_init_irq(void) { omap_init_irq(OMAP34XX_IC_BASE, 96, NULL); - set_handle_irq(omap2_intc_handle_irq); + set_handle_irq(omap_intc_handle_irq); } void __init ti81xx_init_irq(void) { omap_init_irq(OMAP34XX_IC_BASE, 128, NULL); - set_handle_irq(omap2_intc_handle_irq); + set_handle_irq(omap_intc_handle_irq); } static int __init intc_of_init(struct device_node *node, @@ -318,7 +314,7 @@ static int __init intc_of_init(struct device_node *node, omap_init_irq(res.start, nr_irq, of_node_get(node)); - set_handle_irq(omap2_intc_handle_irq); + set_handle_irq(omap_intc_handle_irq); return 0; }