From patchwork Fri Jan 24 16:43:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 23685 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f200.google.com (mail-gg0-f200.google.com [209.85.161.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1CB6F203C5 for ; Fri, 24 Jan 2014 16:43:57 +0000 (UTC) Received: by mail-gg0-f200.google.com with SMTP id f4sf3880053ggn.7 for ; Fri, 24 Jan 2014 08:43:56 -0800 (PST) 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=eiyArPnmm83JJcB65B+3z8jaUKG7Ko6IEwACZp100JA=; b=eeD3/vuMPSde95mdJqrPDnpZDUrgadjAbn1GLYrwFlCU8OAcwpJcVLJM1OgjxkF2+4 2JortRxtU9IiDpiOW/AkwwWQWBmMBXgjRBkIpiGOkM2xGxfOebXZZbhf0uSeDsKtcsH6 bOrZazghXfgJs3fzLcbPDtTrW0jECG4HboKMMYlCrch5Zjn8E61L4JWZcqO2b8+TzIcr NzegIfhAqo2riU8+WILW4YTkw4KY4QxNKwrOBdlnuthZ3mEmvfeHGfXRHRTpT0dx83Ah X8f7duoEvRSiCqe6BTKMz6gNJcMafL51TZXGDCNem/3bYHOoYmbXCPCFecFpzKmAcn5x 1O1w== X-Gm-Message-State: ALoCoQkkQX2gtIl7rszGNw3Knp5i+s1Uwp1xSbSUlqnuxAoNfBI2Ccfv+uMW4kZw7a9pOmHohA9q X-Received: by 10.58.151.98 with SMTP id up2mr4476873veb.14.1390581836168; Fri, 24 Jan 2014 08:43:56 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.102 with SMTP id a93ls621606qga.33.gmail; Fri, 24 Jan 2014 08:43:56 -0800 (PST) X-Received: by 10.220.193.70 with SMTP id dt6mr8120175vcb.17.1390581835973; Fri, 24 Jan 2014 08:43:55 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id sk6si829411vcb.2.2014.01.24.08.43.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jan 2014 08:43:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so2013659vcb.14 for ; Fri, 24 Jan 2014 08:43:55 -0800 (PST) X-Received: by 10.220.191.134 with SMTP id dm6mr8237077vcb.16.1390581835882; Fri, 24 Jan 2014 08:43:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp115785vcz; Fri, 24 Jan 2014 08:43:55 -0800 (PST) X-Received: by 10.14.5.67 with SMTP id 43mr3455996eek.93.1390581835000; Fri, 24 Jan 2014 08:43:55 -0800 (PST) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by mx.google.com with ESMTPS id d8si3152572eeh.179.2014.01.24.08.43.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jan 2014 08:43:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.171 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.215.171; Received: by mail-ea0-f171.google.com with SMTP id f15so531632eak.16 for ; Fri, 24 Jan 2014 08:43:54 -0800 (PST) X-Received: by 10.14.32.132 with SMTP id o4mr13654919eea.14.1390581834435; Fri, 24 Jan 2014 08:43:54 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id k41sm5521285eey.0.2014.01.24.08.43.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2014 08:43:53 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, ian.campbell@citrix.com, tim@xen.org, stefano.stabellini@citrix.com, 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> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390581822-32624-1-git-send-email-julien.grall@linaro.org> References: <1390581822-32624-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Acked-by: Ian Campbell --- 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 */ /*