From patchwork Tue Aug 26 10:03:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 35959 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 034C92054F for ; Tue, 26 Aug 2014 10:05:23 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf112791045pdb.9 for ; Tue, 26 Aug 2014 03:05:22 -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=a2+VqNeM3zxyVeYNps8OEPkBZnF1mRLnSx/xYlwQrhw=; b=NXwNgOsrbvtzvSnA4mJFCV+TLbVEsyrEqHHi1LCWEJQlOmWfKWBwXFJ0d/vB9+LzTp 98X3YaPWX19phN+tP2Xld13M0iOn2/osXtSwZMYtcaXcLfkDx3PVFK5XDj3IeqTgfDwF /L50VN7KhaBuFWaO3469WBlAdgEAgNpCNgwZDAYCX03E9Qzq0S2SC1pi36j7rLoydjiq jJAatuNc9niuWegVHzKXpsRa5ansiRgKti45K+GJ4oQhCt0I7RrRkfzft9GSgBdmeMZR 7Bilw8l17K9kPPDYHDM1kSqUYHoFciiberNTZ7JpsHf0QL52r+V1siojZME03Fhhqmwf 70iw== X-Gm-Message-State: ALoCoQmVv3n1VySvu0aHj8FJcucChGmgMJv9si11IUNJL+G/TiF5MgCcP9VGF6AoVcWk0B+JqqAM X-Received: by 10.66.162.162 with SMTP id yb2mr8039394pab.39.1409047522446; Tue, 26 Aug 2014 03:05:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.202 with SMTP id k68ls2552185qge.48.gmail; Tue, 26 Aug 2014 03:05:22 -0700 (PDT) X-Received: by 10.220.112.143 with SMTP id w15mr670385vcp.41.1409047522346; Tue, 26 Aug 2014 03:05:22 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id j6si1204323vcs.30.2014.08.26.03.05.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 03:05:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id hq11so16569204vcb.16 for ; Tue, 26 Aug 2014 03:05:22 -0700 (PDT) X-Received: by 10.53.0.164 with SMTP id az4mr570242vdd.52.1409047522258; Tue, 26 Aug 2014 03:05:22 -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.45.67 with SMTP id uj3csp185026vcb; Tue, 26 Aug 2014 03:05:21 -0700 (PDT) X-Received: by 10.68.234.37 with SMTP id ub5mr35708352pbc.34.1409047521404; Tue, 26 Aug 2014 03:05:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ti10si3191070pab.206.2014.08.26.03.05.19 for ; Tue, 26 Aug 2014 03:05:20 -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 S934502AbaHZKEL (ORCPT + 26 others); Tue, 26 Aug 2014 06:04:11 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:20687 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934418AbaHZKEH (ORCPT ); Tue, 26 Aug 2014 06:04:07 -0400 Received: from e102391-lin.cambridge.arm.com (e102391-lin.cambridge.arm.com [10.1.209.143]) by collaborate-mta1.arm.com (Postfix) with ESMTP id E329813FB6A; Tue, 26 Aug 2014 05:04:03 -0500 (CDT) From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux@lists.openrisc.net Cc: linux@arm.linux.org.uk, shawn.guo@freescale.com, kernel@pengutronix.de, tony@atomide.com, catalin.marinas@arm.com, will.deacon@arm.com, jonas@southpole.se, tglx@linutronix.de, jason@lakedaemon.net, shc_work@mail.ru, baohua@kernel.org, maxime.ripard@free-electrons.com, marc.zyngier@arm.com, khilman@linaro.org, sboyd@codeaurora.org, lorenzo.pieralisi@arm.com, larry.bassel@linaro.org, mark.rutland@arm.com, sudeep.holla@arm.com, stefan.kristiansson@saunalahti.fi, vkale@apm.com, schwidefsky@de.ibm.com Subject: [PATCH v2 06/26] irqchip: armada-370-xp: convert to handle_domain_irq Date: Tue, 26 Aug 2014 11:03:21 +0100 Message-Id: <1409047421-27649-7-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1409047421-27649-1-git-send-email-marc.zyngier@arm.com> References: <1409047421-27649-1-git-send-email-marc.zyngier@arm.com> 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.171 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 --- 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; }