From patchwork Tue Apr 22 12:58:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 28792 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C929A203AC for ; Tue, 22 Apr 2014 13:04:53 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kl14sf1405683pab.2 for ; Tue, 22 Apr 2014 06:04:53 -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=MSGRL1/yVoi2uFO5COJeUYSeueTqep69FGfY1hQCgOc=; b=RkPaxpLhshxnx3vKlfOpi0Di1AaEUMTnHjjfzQRvq/Mo7RdssejkGvWM4Ynjpj9do1 DhG3Qa2pVbTXCGDr/prbSoVQHFiGFCK+/TmX0IK6cwKJ4/JGyxkV3WIotz8QWtNXxGm3 hiYIQhGzvL8wDUD+FTYn417Rq3f0bLQ/o46NeYs421gN6ERz2YdS1XlclwkN1DswbQnF zaW8e83WzNM0J1Ky/cptWvHDJKHrNdpaApn+iGeaHJUQlH86svyvlkp49xM0/N3fivHU fWJSPIdvvReju+/5qOI1TQnXx3M+ipA2Wd2+gGdzEVRVpCjLkEAwrVs7qBk1dI+iayEB E4+w== X-Gm-Message-State: ALoCoQmJX78Y5G5Sa4SWDpQR++hA5zjt1HUYiinCDU7fk9L9YTNUue3dgEQdv0qluBr0AvvsX2ZB X-Received: by 10.66.144.228 with SMTP id sp4mr21646814pab.5.1398171893080; Tue, 22 Apr 2014 06:04:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.69 with SMTP id e63ls90748qgd.29.gmail; Tue, 22 Apr 2014 06:04:52 -0700 (PDT) X-Received: by 10.58.154.10 with SMTP id vk10mr36890929veb.18.1398171892819; Tue, 22 Apr 2014 06:04:52 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id d20si6892499veu.43.2014.04.22.06.04.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:04:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so9702000veb.12 for ; Tue, 22 Apr 2014 06:04:52 -0700 (PDT) X-Received: by 10.220.109.138 with SMTP id j10mr1733vcp.54.1398171892707; Tue, 22 Apr 2014 06:04:52 -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 ib8csp22921vcb; Tue, 22 Apr 2014 06:04:52 -0700 (PDT) X-Received: by 10.220.188.10 with SMTP id cy10mr494955vcb.36.1398171891719; Tue, 22 Apr 2014 06:04:51 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id sc7si6867527vdc.175.2014.04.22.06.04.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:04:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WcaJg-00023q-OC; Tue, 22 Apr 2014 13:00:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaIE-0001hB-89 for xen-devel@lists.xenproject.org; Tue, 22 Apr 2014 12:59:44 +0000 Received: from [193.109.254.147:6043] by server-7.bemta-14.messagelabs.com id 99/15-17726-9A766535; Tue, 22 Apr 2014 12:59:21 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1398171560!117960!1 X-Originating-IP: [74.125.83.41] 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 22581 invoked from network); 22 Apr 2014 12:59:20 -0000 Received: from mail-ee0-f41.google.com (HELO mail-ee0-f41.google.com) (74.125.83.41) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 22 Apr 2014 12:59:20 -0000 Received: by mail-ee0-f41.google.com with SMTP id t10so4673224eei.28 for ; Tue, 22 Apr 2014 05:59:20 -0700 (PDT) X-Received: by 10.14.69.201 with SMTP id n49mr2127308eed.106.1398171560519; Tue, 22 Apr 2014 05:59:20 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id x45sm112862825eef.15.2014.04.22.05.59.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Apr 2014 05:59:19 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 22 Apr 2014 13:58:48 +0100 Message-Id: <1398171530-27391-17-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398171530-27391-1-git-send-email-julien.grall@linaro.org> References: <1398171530-27391-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 v4 16/18] 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=neutral (google.com: 209.85.128.181 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 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 a09ca25..45fbadb 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -216,7 +216,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);