From patchwork Mon May 12 17:57:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 29994 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E76B238EB for ; Mon, 12 May 2014 18:07:30 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf44536977pab.5 for ; Mon, 12 May 2014 11:07:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=t/HuxdkGNB5A9KYgZiVcF2i5v7J27lp3g5OYo3JgHX8=; b=OZ1FbpAhdhBShk35f8CLdKSlncJ1o0EAHgMyDLrCrGglGF5x29Hmvm7pSi6HoTennD hlP/Dy5Udg4zdWRtZi58ypfkZTU4FZqJvSKJhs424oZwhLsrHi40L04DgB1LAvq4MABp HuwseKMbqNIKN+pIx7Vx5bUvMQUTsHuEvBnu2Yb9qH3pjptSSunKJ+Q87Rr+TGgD76VX 01bLVS3HFprFPfoU9ZyB+5zWOvP2yl+hytXY9ZvSaIGZFzKXCC6gxPxMAz+PpAEV5ujL lp6NsetLmJ5Yixd1HKuvmr9FagkelqeZ0OZbzPuvj0hjK3TrLzNDYI/5r3wqRnApepTk d/AA== X-Gm-Message-State: ALoCoQlK2lFedGze6WHBQ6EfKGYmy+2PBlDbSfkUe7lgTurhD8pOGZSvr9yL9yCVyUAqegvmI+Q3 X-Received: by 10.66.149.67 with SMTP id ty3mr11604553pab.27.1399918049728; Mon, 12 May 2014 11:07:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.99 with SMTP id y90ls1440941qgd.82.gmail; Mon, 12 May 2014 11:07:29 -0700 (PDT) X-Received: by 10.220.161.8 with SMTP id p8mr24514324vcx.4.1399918049538; Mon, 12 May 2014 11:07:29 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id ya4si2196045vec.163.2014.05.12.11.07.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 12 May 2014 11:07:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so9240845veb.17 for ; Mon, 12 May 2014 11:07:29 -0700 (PDT) X-Received: by 10.58.24.231 with SMTP id x7mr1849542vef.71.1399918048947; Mon, 12 May 2014 11:07:28 -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.220.221.72 with SMTP id ib8csp89290vcb; Mon, 12 May 2014 11:07:28 -0700 (PDT) X-Received: by 10.58.161.101 with SMTP id xr5mr2217848veb.36.1399917548458; Mon, 12 May 2014 10:59:08 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id tb2si2181884vdc.183.2014.05.12.10.59.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 12 May 2014 10:59:08 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WjuUB-0005sp-WC; Mon, 12 May 2014 17:58:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WjuUA-0005s1-2Z for xen-devel@lists.xenproject.org; Mon, 12 May 2014 17:57:58 +0000 Received: from [85.158.139.211:44567] by server-4.bemta-5.messagelabs.com id 11/73-30750-5AB01735; Mon, 12 May 2014 17:57:57 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-206.messagelabs.com!1399917451!908998!1 X-Originating-IP: [74.125.83.53] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14236 invoked from network); 12 May 2014 17:57:31 -0000 Received: from mail-ee0-f53.google.com (HELO mail-ee0-f53.google.com) (74.125.83.53) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 May 2014 17:57:31 -0000 Received: by mail-ee0-f53.google.com with SMTP id c13so4878161eek.26 for ; Mon, 12 May 2014 10:57:31 -0700 (PDT) X-Received: by 10.15.51.193 with SMTP id n41mr34565470eew.80.1399917451293; Mon, 12 May 2014 10:57:31 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id l3sm34404295eeo.43.2014.05.12.10.57.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2014 10:57:30 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 12 May 2014 18:57:15 +0100 Message-Id: <1399917438-21475-5-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399917438-21475-1-git-send-email-julien.grall@linaro.org> References: <1399917438-21475-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com, Jan Beulich Subject: [Xen-devel] [PATCH v6 4/6] xen: IRQ: Add dev_id parameter to release_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 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-Archive: The new parameter (dev_id) will be used in on ARM to release the right action when support for multiple action is added. Even if this function is declared in common code, no one is using it. So it's safe to modify the prototype also for x86. Signed-off-by: Julien Grall Acked-by: Jan Beulich Acked-by: Ian Campbell --- Changes in v3: - Fix typoes in commit message - Don't remove __init on release_irq for x86 Changes in v2: - Patch added --- xen/arch/arm/irq.c | 2 +- xen/arch/x86/irq.c | 2 +- xen/include/xen/irq.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 4b0d534..8e45b9e 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -232,7 +232,7 @@ out_no_end: irq_exit(); } -void release_irq(unsigned int irq) +void release_irq(unsigned int irq, const void *dev_id) { struct irq_desc *desc; unsigned long flags; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5b5b169..727472d 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -983,7 +983,7 @@ int __init request_irq(unsigned int irq, return retval; } -void __init release_irq(unsigned int irq) +void __init release_irq(unsigned int irq, const void *dev_id) { struct irq_desc *desc; unsigned long flags; diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index f2e6215..1f8bdb3 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -90,7 +90,7 @@ int arch_init_one_irq_desc(struct irq_desc *); #define irq_desc_initialized(desc) ((desc)->handler != NULL) extern int setup_irq(unsigned int irq, struct irqaction *); -extern void release_irq(unsigned int irq); +extern void release_irq(unsigned int irq, const void *dev_id); extern int request_irq(unsigned int irq, void (*handler)(int, void *, struct cpu_user_regs *), const char * devname, void *dev_id);