From patchwork Tue Jul 8 13:10:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 33207 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5653320969 for ; Tue, 8 Jul 2014 13:13:29 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kq14sf41770844pab.0 for ; Tue, 08 Jul 2014 06:13:28 -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:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=6KB5XSnS3laAtBGO5czA5fziYMGa3px/+FgWSpTci3E=; b=l9lV1csEoaEZnbm7rxCsdEHAy0zd6zSqE2meMmHcUIEt8yQTVyIroDsx+WXffis/Fi D0kTLKQK/5M0BGb6xy6sFlfo3DqOUk+vaJMrWUnHIdnRBZThCUsz/5BPbrqckKSHhUX6 tI8Hm4EzaXcL7V+SPt/S43hEbDvFhY09II8Xjh7ol1CWGxuNyJJakoUBTmDR6qiS5ox5 DoqWpOiSOxqKcl4+PEzDpxZvMlosM/1+m2y6Ic5ow12ApASS3hMliZKLHmlYmrqfCZJU CVM81EuDhKDesHwbNrxUwdSYMsrPSp0XosxDnk082Jo1+QgwbiH0KlNMT2c3Th/xyEZt NRoQ== X-Gm-Message-State: ALoCoQlg2gasnPSXQesUe2IjZzzw4KPusPAFGLp7/A3nhXh22ucgKIgiINiS4HV7Cogfi0Zx7bVq X-Received: by 10.66.137.105 with SMTP id qh9mr17340348pab.30.1404825208646; Tue, 08 Jul 2014 06:13:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.34 with SMTP id i31ls2116932qgf.51.gmail; Tue, 08 Jul 2014 06:13:28 -0700 (PDT) X-Received: by 10.220.192.129 with SMTP id dq1mr256555vcb.57.1404825208465; Tue, 08 Jul 2014 06:13:28 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id v15si6605636vew.69.2014.07.08.06.13.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Jul 2014 06:13:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so5751874veb.0 for ; Tue, 08 Jul 2014 06:13:28 -0700 (PDT) X-Received: by 10.52.23.71 with SMTP id k7mr28210754vdf.27.1404825208396; Tue, 08 Jul 2014 06:13:28 -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 tc5csp769471vcb; Tue, 8 Jul 2014 06:13:27 -0700 (PDT) X-Received: by 10.66.188.5 with SMTP id fw5mr34403756pac.63.1404825207597; Tue, 08 Jul 2014 06:13:27 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id yr5si43471493pab.84.2014.07.08.06.13.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 06:13:27 -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 1X4VBz-0006Pt-5o; Tue, 08 Jul 2014 13:12:19 +0000 Received: from inca-roads.misterjones.org ([213.251.177.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4VAx-0005m6-2n for linux-arm-kernel@lists.infradead.org; Tue, 08 Jul 2014 13:11:24 +0000 Received: from [176.25.195.83] (helo=why.wild-wind.fr.eu.org) by cheepnis.misterjones.org with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.80) (envelope-from ) id 1X4VAY-0006Ke-6u; Tue, 08 Jul 2014 15:10:50 +0200 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/15] irqchip: armada-370-xp: convert to handle_domain_irq Date: Tue, 8 Jul 2014 14:10:27 +0100 Message-Id: <1404825038-547-5-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1404825038-547-1-git-send-email-marc.zyngier@arm.com> References: <1404825038-547-1-git-send-email-marc.zyngier@arm.com> X-SA-Exim-Connect-IP: 176.25.195.83 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, tglx@linutronix.de, jason@lakedaemon.net, shc_work@mail.ru, baohua@kernel.org, maxime.ripard@free-electrons.com, khilman@linaro.org, daniel.lezcano@linaro.org, lorenzo.pieralisi@arm.com, larry.bassel@linaro.org, mark.rutland@arm.com, sudeep.holla@arm.com X-SA-Exim-Mail-From: marc.zyngier@arm.com X-SA-Exim-Scanned: No (on cheepnis.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140708_061115_295987_EF0BAD12 X-CRM114-Status: GOOD ( 12.17 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) Cc: Mark Rutland , Barry Song , Kevin Hilman , Russell King , Jason Cooper , Alexander Shiyan , Larry Bassel , Catalin Marinas , Daniel Lezcano , Will Deacon , Lorenzo Pieralisi , Sudeep Holla , Thomas Gleixner , Maxime Ripard 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: , MIME-Version: 1.0 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: marc.zyngier@arm.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.128.169 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 Use the new handle_domain_irq method to handle interrupts. Signed-off-by: Marc Zyngier --- drivers/irqchip/irq-armada-370-xp.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 574aba0..47144be 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -393,13 +393,15 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained) if (!(msimask & BIT(msinr))) continue; - irq = irq_find_mapping(armada_370_xp_msi_domain, - msinr - 16); - - if (is_chained) + if (is_chained) { + irq = irq_find_mapping(armada_370_xp_msi_domain, + msinr - 16); generic_handle_irq(irq); - else - handle_IRQ(irq, regs); + } else { + irq = msi - 16; + handle_domain_irq(armada_370_xp_msi_domain, + irq, regs); + } } } #else @@ -444,9 +446,8 @@ armada_370_xp_handle_irq(struct pt_regs *regs) break; if (irqnr > 1) { - irqnr = irq_find_mapping(armada_370_xp_mpic_domain, - irqnr); - handle_IRQ(irqnr, regs); + handle_domain_irq(armada_370_xp_mpic_domain, + irqnr, regs); continue; }