From patchwork Fri May 16 14:40:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 30335 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 295E920A25 for ; Fri, 16 May 2014 14:42:39 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id uq10sf2587478igb.1 for ; Fri, 16 May 2014 07:42:38 -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=huFWRykdqSUh4KgryNPqmZ78wJZipTJ9CdvCxQfaowc=; b=F62MtzYvM/ibc3hZUt5WCHKKNzBieBfpVbAEHL+uSTgxtgKDic3V3wDMP89gndjQkd cOWSElcWLxQGL2zVBjRCGstEfJ7mkhzEhZiuY0jZfJ1nf13BocV2AQ1QI7BjF3iWMRWd RrVAsy8tN/gEn47e2sHpS2YVRU9hU3Lrh0c0yQfq268Kqo2FRhM/H0pI94c967K2fLPD bHAUbjaftAjHlUUQJejHiI5xDYEg6+0OVvPA17q7HpULTCae7IQ6ou1vRp2cnZ98bbN4 0Z3kv5XaRcEE2DMDZUWeCS14Ag1cpLeKiPhPGPkoHP2yWwoyb4+z+9w6S7kqGlfODY8t K5dA== X-Gm-Message-State: ALoCoQnPUu5pDWtJcwPRJsdc4GcWojtXLkFQUfnP63R8RTv9xBFa7aVmAbjQUct3W+hkg6kEqNSv X-Received: by 10.50.178.200 with SMTP id da8mr8756668igc.6.1400251358332; Fri, 16 May 2014 07:42:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.85 with SMTP id 79ls726705qgk.41.gmail; Fri, 16 May 2014 07:42:38 -0700 (PDT) X-Received: by 10.58.112.8 with SMTP id im8mr1203386veb.35.1400251358105; Fri, 16 May 2014 07:42:38 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id af10si1634167vec.131.2014.05.16.07.42.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 May 2014 07:42:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id jx11so3301467veb.28 for ; Fri, 16 May 2014 07:42:38 -0700 (PDT) X-Received: by 10.52.139.101 with SMTP id qx5mr12118154vdb.17.1400251358000; Fri, 16 May 2014 07:42:38 -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 ib8csp58392vcb; Fri, 16 May 2014 07:42:37 -0700 (PDT) X-Received: by 10.50.13.67 with SMTP id f3mr51977855igc.9.1400251356801; Fri, 16 May 2014 07:42:36 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id rt10si3615747igb.26.2014.05.16.07.42.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 May 2014 07:42:36 -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 1WlJJV-0005NV-Rn; Fri, 16 May 2014 14:40:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WlJJU-0005MZ-BV for xen-devel@lists.xenproject.org; Fri, 16 May 2014 14:40:44 +0000 Received: from [85.158.139.211:65394] by server-2.bemta-5.messagelabs.com id 48/3D-12074-B6326735; Fri, 16 May 2014 14:40:43 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-6.tower-206.messagelabs.com!1400251242!4720614!1 X-Originating-IP: [74.125.83.43] 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 26868 invoked from network); 16 May 2014 14:40:42 -0000 Received: from mail-ee0-f43.google.com (HELO mail-ee0-f43.google.com) (74.125.83.43) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 16 May 2014 14:40:42 -0000 Received: by mail-ee0-f43.google.com with SMTP id d17so1649677eek.30 for ; Fri, 16 May 2014 07:40:42 -0700 (PDT) X-Received: by 10.14.9.137 with SMTP id 9mr23397303eet.53.1400251242568; Fri, 16 May 2014 07:40:42 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id s46sm20538730ees.3.2014.05.16.07.40.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 May 2014 07:40:41 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 16 May 2014 15:40:30 +0100 Message-Id: <1400251232-7695-5-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400251232-7695-1-git-send-email-julien.grall@linaro.org> References: <1400251232-7695-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 v7 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.169 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 fa35e0d..24eca0a 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);