From patchwork Fri May 2 15:52:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 29564 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A85CC202E7 for ; Fri, 2 May 2014 15:54:25 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id m1sf13553308oag.6 for ; Fri, 02 May 2014 08:54:25 -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=pzTVw/PAuvtF5INldACL4XFJkebGVeoOcCuq5MgwlSM=; b=APwJzCGUCAbKNgPjVaXzshWtxwnZOx/Q1YoVKKRMdUQ9JLlRCtsXuMf6lR7nL5FfLF DoYbuFmewjGE84tU9BHSbTnUpUU7h5UeIw0TPxR1xV7iJpoUc7T5XsxTccXEWh81fDCm lROaBASKt8+IaTaxTpGdiRCFUKmh2LcDJzllPM0B7a3VnMwpmHRLTTHld4iz0d5oCpeK Afl9gWZ26oU2BWNyF68PXZ7OXloWrUoxweAg2xMT0ib2bic1WRRrJ/0zCX6DKpogtkRu 9ntkmoqmQjdFDM2VEi/xpEaNDixeuLWJxYQbogP5LyQTnCdekxjp/QZv0GdSaISNWfqU xkEQ== X-Gm-Message-State: ALoCoQnKc3IBlOczoncGuutB6STWkNO8WDDsUTmFmYcwrG9p7F6RpQbykWHAq7S7baWdLXTmdNkL X-Received: by 10.43.139.66 with SMTP id iv2mr8549217icc.17.1399046065264; Fri, 02 May 2014 08:54:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.68 with SMTP id q62ls1672480qgd.27.gmail; Fri, 02 May 2014 08:54:25 -0700 (PDT) X-Received: by 10.58.111.163 with SMTP id ij3mr2236377veb.26.1399046065119; Fri, 02 May 2014 08:54:25 -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 sq9si6771823vdc.143.2014.05.02.08.54.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 08:54:25 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id db11so954591veb.1 for ; Fri, 02 May 2014 08:54:25 -0700 (PDT) X-Received: by 10.58.132.228 with SMTP id ox4mr519924veb.54.1399046065053; Fri, 02 May 2014 08:54:25 -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 ib8csp112984vcb; Fri, 2 May 2014 08:54:24 -0700 (PDT) X-Received: by 10.224.166.129 with SMTP id m1mr23808035qay.58.1399046063682; Fri, 02 May 2014 08:54:23 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id z5si14361511qgd.68.2014.05.02.08.54.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 May 2014 08:54:23 -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 1WgFlH-00075k-GY; Fri, 02 May 2014 15:52:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WgFl7-000754-1k for xen-devel@lists.xenproject.org; Fri, 02 May 2014 15:52:30 +0000 Received: from [85.158.139.211:49490] by server-7.bemta-5.messagelabs.com id AB/1C-20531-43FB3635; Fri, 02 May 2014 15:52:20 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-10.tower-206.messagelabs.com!1399045939!1985244!1 X-Originating-IP: [74.125.83.50] 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 16280 invoked from network); 2 May 2014 15:52:19 -0000 Received: from mail-ee0-f50.google.com (HELO mail-ee0-f50.google.com) (74.125.83.50) by server-10.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 May 2014 15:52:19 -0000 Received: by mail-ee0-f50.google.com with SMTP id c13so3328976eek.9 for ; Fri, 02 May 2014 08:52:19 -0700 (PDT) X-Received: by 10.15.101.9 with SMTP id bo9mr1128588eeb.75.1399045939112; Fri, 02 May 2014 08:52:19 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id 48sm5508099eei.24.2014.05.02.08.52.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 May 2014 08:52:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 2 May 2014 16:52:08 +0100 Message-Id: <1399045930-17364-5-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399045930-17364-1-git-send-email-julien.grall@linaro.org> References: <1399045930-17364-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 v5 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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 4570399..b5e3d18 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -218,7 +218,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);