From patchwork Tue Jul 8 13:45:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 33220 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D53AD2070A for ; Tue, 8 Jul 2014 13:46:05 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id jx11sf3505324veb.0 for ; Tue, 08 Jul 2014 06:46:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=8vNIvfoPyuiSOn5AiU9e9lpwFy2QY1WQH+rHV1T/nxM=; b=BJqju0aTXMdfg+gU2JPBwFK+yS+jfI3jsN9QL6E7Dhgsl5JqAZGj1DZXhY7Yddxiyi e8geilrhlvFbU8Yo6tOqMW266IP4zcQEO2p3ZahYRhIJHH2Zp9nTjhX/ceqUpZGpI5yL J81ncaHdjsF+MjW9pEDBPcYYPTY5fFsc5r8xg0SHKqVkvQfdjWZCySMz0cg4ukZFuYkw bJfGi6FirEuMH5LgcNY6QCrhxoNbUqXma5vxhET3fMb0R5/Qdzl2ZUjRV6RuKsRNLzOG CfOP92+1zP8mwWbZE0CRKDtd8qjtVD4cuKRv6nGKvZ2Ugj2g8qOtC8PCG/CoeYG76oL8 Ok1Q== X-Gm-Message-State: ALoCoQkal8zqFpUfZGV6Pcuuy2iGA1yBERyBcB96XYz0R83W6UH06l/y05cBpZtsdB/voN9DJEgf X-Received: by 10.58.151.201 with SMTP id us9mr16483996veb.23.1404827165704; Tue, 08 Jul 2014 06:46:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.40 with SMTP id m37ls2307813qgd.18.gmail; Tue, 08 Jul 2014 06:46:05 -0700 (PDT) X-Received: by 10.58.152.234 with SMTP id vb10mr33786062veb.21.1404827165613; Tue, 08 Jul 2014 06:46:05 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id ua6si20155673vcb.14.2014.07.08.06.46.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Jul 2014 06:46:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so5402054vcb.35 for ; Tue, 08 Jul 2014 06:46:05 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr28315069vdc.24.1404827165536; Tue, 08 Jul 2014 06:46:05 -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 tc5csp771976vcb; Tue, 8 Jul 2014 06:46:05 -0700 (PDT) X-Received: by 10.68.173.1 with SMTP id bg1mr35218865pbc.13.1404827164758; Tue, 08 Jul 2014 06:46:04 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b14si6077277pdm.20.2014.07.08.06.46.03; Tue, 08 Jul 2014 06:46:04 -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 S1754529AbaGHNpw (ORCPT + 27 others); Tue, 8 Jul 2014 09:45:52 -0400 Received: from inca-roads.misterjones.org ([213.251.177.50]:41119 "EHLO inca-roads.misterjones.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753143AbaGHNpt (ORCPT ); Tue, 8 Jul 2014 09:45:49 -0400 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 1X4ViO-00076z-Ag; Tue, 08 Jul 2014 15:45:48 +0200 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Russell King , Catalin Marinas , Will Deacon , Thomas Gleixner , Jason Cooper , Alexander Shiyan , Barry Song , Maxime Ripard , Kevin Hilman , Daniel Lezcano , Lorenzo Pieralisi , Larry Bassel , Mark Rutland , Sudeep Holla Subject: [PATCH v2 04/15] irqchip: armada-370-xp: convert to handle_domain_irq Date: Tue, 8 Jul 2014 14:45:41 +0100 Message-Id: <1404827141-30381-2-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1404827141-30381-1-git-send-email-marc.zyngier@arm.com> References: <1404827141-30381-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 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: 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.220.176 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: , Use the new handle_domain_irq method to handle interrupts. Signed-off-by: Marc Zyngier --- Sending the right patch this time... 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..fa75a29 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 = msinr - 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; }