From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v2 05/16] xen/arm: IRQ: drop irq parameter in __setup_irq Date: Thu, 3 Apr 2014 21:41:56 +0100 Message-ID: <1396557727-19102-6-git-send-email-julien.grall@linaro.org> References: <1396557727-19102-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WVoT0-0008BW-VO for xen-devel@lists.xenproject.org; Thu, 03 Apr 2014 20:42:31 +0000 Received: by mail-wi0-f173.google.com with SMTP id z2so103970wiv.0 for ; Thu, 03 Apr 2014 13:42:29 -0700 (PDT) In-Reply-To: <1396557727-19102-1-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org The IRQ number is already provided by desc. Signed-off-by: Julien Grall --- Changes in v2: - Patch added --- xen/arch/arm/gic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 9bf7e1e..19db06a 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -594,8 +594,7 @@ void __init release_irq(unsigned int irq) xfree(action); } -static int __setup_irq(struct irq_desc *desc, unsigned int irq, - struct irqaction *new) +static int __setup_irq(struct irq_desc *desc, struct irqaction *new) { if ( desc->action != NULL ) return -EBUSY; @@ -615,7 +614,7 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) desc = irq_to_desc(irq->irq); spin_lock_irqsave(&desc->lock, flags); - rc = __setup_irq(desc, irq->irq, new); + rc = __setup_irq(desc, new); spin_unlock_irqrestore(&desc->lock, flags); if ( !rc ) @@ -790,7 +789,7 @@ int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, gic_set_irq_properties(irq->irq, level, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); - retval = __setup_irq(desc, irq->irq, action); + retval = __setup_irq(desc, action); if (retval) { xfree(action); goto out; -- 1.7.10.4