From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH for-4.5 5/8] xen/arm: IRQ: rename release_irq in release_dt_irq Date: Fri, 24 Jan 2014 16:43:39 +0000 Message-ID: <1390581822-32624-6-git-send-email-julien.grall@linaro.org> References: <1390581822-32624-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W6jrI-0001vB-4s for xen-devel@lists.xenproject.org; Fri, 24 Jan 2014 16:43:56 +0000 Received: by mail-ea0-f169.google.com with SMTP id l9so958835eaj.28 for ; Fri, 24 Jan 2014 08:43:54 -0800 (PST) In-Reply-To: <1390581822-32624-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, patches@linaro.org List-Id: xen-devel@lists.xenproject.org Rename the function and make the prototype consistent with request_dt_irq. The new parameter (dev_id) will be used in a later patch to release the right action when the support for multiple action will be added. Signed-off-by: Julien Grall --- xen/arch/arm/gic.c | 4 ++-- xen/include/asm-arm/irq.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 58bcba3..2643b46 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -520,13 +520,13 @@ void gic_disable_cpu(void) spin_unlock(&gic.lock); } -void __init release_irq(unsigned int irq) +void release_dt_irq(const struct dt_irq *irq, const void *dev_id) { struct irq_desc *desc; unsigned long flags; struct irqaction *action; - desc = irq_to_desc(irq); + desc = irq_to_desc(irq->irq); desc->handler->shutdown(desc); diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index 7c20703..bd8aac1 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -44,6 +44,7 @@ int __init request_dt_irq(const struct dt_irq *irq, void (*handler)(int, void *, struct cpu_user_regs *), const char *devname, void *dev_id); int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new); +void release_dt_irq(const struct dt_irq *irq, const void *dev_id); #endif /* _ASM_HW_IRQ_H */ /* -- 1.7.10.4