From patchwork Tue Apr 8 14:44:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 27993 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A508020447 for ; Tue, 8 Apr 2014 14:45:59 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf4530594oag.9 for ; Tue, 08 Apr 2014 07:45:59 -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=wncQUX6Z4/VBTKZHABZuCx1cUyBChlWpMflGHX3054Q=; b=JB/7KMz+ay+ObJRLa7fiUL2o6RRY4gJvsl/q405oKVISGkNhO+Jbp7cCo32vO8b4Ny C0+IPnIdsNH6W5N3zEpFNR4vxdAAcGVZahxNwJnoCjabFD0o4PZlytzWRnHiqa9p8si5 t6/mrMsTo+2F2zsCWDeFut2klZh4TuH6D091t3+7aLk/f2piDcmmuzvnOK/emD/rIOkZ hJfb+gcltCXMxH7bhFHj/USgZEzLJXzexPJl2xNeBgl+acoJ0l/MFDmGOG+VyBobWHO4 OQhFwh1n690bQlxYWM6wBCU1UZnDMR7ZWL6T96IoRF75WTLc9vQ5WDCYbt/9A5XNa6qk BTyA== X-Gm-Message-State: ALoCoQmV4CKW62uYclz4dKBuNt82kRn1+09K137sylAdvxn/S282LZ18czRaKP4K2XakdxRt51OP X-Received: by 10.42.235.206 with SMTP id kh14mr1625537icb.30.1396968359170; Tue, 08 Apr 2014 07:45:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.45 with SMTP id l42ls228965qga.50.gmail; Tue, 08 Apr 2014 07:45:59 -0700 (PDT) X-Received: by 10.58.1.97 with SMTP id 1mr2169659vel.23.1396968359036; Tue, 08 Apr 2014 07:45:59 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id uq6si439729vcb.0.2014.04.08.07.45.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 07:45:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 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.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so857955veb.15 for ; Tue, 08 Apr 2014 07:45:59 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr666008vec.28.1396968358955; Tue, 08 Apr 2014 07:45:58 -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.12.8 with SMTP id v8csp251666vcv; Tue, 8 Apr 2014 07:45:58 -0700 (PDT) X-Received: by 10.221.63.1 with SMTP id xc1mr150591vcb.35.1396968358452; Tue, 08 Apr 2014 07:45:58 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ru8si429964vcb.137.2014.04.08.07.45.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Apr 2014 07:45:58 -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 1WXXGN-0000RG-4Y; Tue, 08 Apr 2014 14:44:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXXGL-0000NY-9Z for xen-devel@lists.xenproject.org; Tue, 08 Apr 2014 14:44:33 +0000 Received: from [85.158.143.35:28330] by server-2.bemta-4.messagelabs.com id 10/75-06539-05B04435; Tue, 08 Apr 2014 14:44:32 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1396968271!7828816!1 X-Originating-IP: [74.125.83.54] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26795 invoked from network); 8 Apr 2014 14:44:31 -0000 Received: from mail-ee0-f54.google.com (HELO mail-ee0-f54.google.com) (74.125.83.54) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Apr 2014 14:44:31 -0000 Received: by mail-ee0-f54.google.com with SMTP id d49so766389eek.41 for ; Tue, 08 Apr 2014 07:44:31 -0700 (PDT) X-Received: by 10.15.51.1 with SMTP id m1mr5066186eew.25.1396968271551; Tue, 08 Apr 2014 07:44:31 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id m42sm5031709eex.21.2014.04.08.07.44.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Apr 2014 07:44:30 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 8 Apr 2014 15:44:05 +0100 Message-Id: <1396968247-8768-17-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396968247-8768-1-git-send-email-julien.grall@linaro.org> References: <1396968247-8768-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 v3 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.170 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 Cc: Jan Beulich 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 5db474f..598f2b4 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -213,7 +213,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 88444be..eb8dcb2 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);